diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift
index a2f076a..5cda404 100644
--- a/SocketIOClientSwift/SocketEngine.swift
+++ b/SocketIOClientSwift/SocketEngine.swift
@@ -257,8 +257,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
                 return
             } else if !self!.closed && self!.polling {
                 self?.doPoll()
-            }
-            }.resume()
+            }}.resume()
     }
     
     private func flushProbeWait() {
diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift
index efeddc5..93d80a7 100644
--- a/SocketIOClientSwift/SocketPacket.swift
+++ b/SocketIOClientSwift/SocketPacket.swift
@@ -172,22 +172,14 @@ final class SocketPacket: Printable {
                     options: NSJSONWritingOptions(0), error: &err)
                 let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding)
                 
-                message += jsonString! as String
-                message += ","
-                continue
+                message += jsonString! as String + ","
+            } else if arg is String {
+                message += "\"\(arg)\","
             } else if arg is NSNull {
                 message += "null,"
-                continue
+            } else {
+                message += "\(arg),"
             }
-            
-            if arg is String {
-                message += "\"\(arg)\""
-                message += ","
-                continue
-            }
-            
-            message += "\(arg)"
-            message += ","
         }
         
         if message != "" {