diff --git a/Source/SocketAckEmitter.swift b/Source/SocketAckEmitter.swift
index 6303175..678f084 100644
--- a/Source/SocketAckEmitter.swift
+++ b/Source/SocketAckEmitter.swift
@@ -34,13 +34,13 @@ public final class SocketAckEmitter: NSObject {
     }
     
     public func with(items: AnyObject...) {
-        guard ackNum != -1 else {return}
+        guard ackNum != -1 else { return }
         
         socket.emitAck(ackNum, withItems: items)
     }
     
     public func with(items: [AnyObject]) {
-        guard ackNum != -1 else {return}
+        guard ackNum != -1 else { return }
         
         socket.emitAck(ackNum, withItems: items)
     }
diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index 675bfc0..8ec6c84 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -171,9 +171,9 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
         connected = false
 
         if websocket {
-            sendWebSocketMessage("", withType: .Close)
+            sendWebSocketMessage("", withType: .Close, withData: [])
         } else {
-            sendPollMessage("", withType: .Close)
+            sendPollMessage("", withType: .Close, withData: [])
         }
         
         ws?.disconnect()
@@ -270,7 +270,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
                 "we'll probably disconnect soon. You should report this.", type: logType)
         }
 
-        sendWebSocketMessage("", withType: .Upgrade, datas: nil)
+        sendWebSocketMessage("", withType: .Upgrade, withData: [])
         websocket = true
         polling = false
         fastUpgrade = false
@@ -455,7 +455,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
 
     private func probeWebSocket() {
         if websocketConnected {
-            sendWebSocketMessage("probe", withType: .Ping)
+            sendWebSocketMessage("probe", withType: .Ping, withData: [])
         }
     }
     
@@ -516,7 +516,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
             DefaultSocketLogger.Logger.log("Upgrading transport to WebSockets", type: logType)
 
             fastUpgrade = true
-            sendPollMessage("", withType: .Noop)
+            sendPollMessage("", withType: .Noop, withData: [])
             // After this point, we should not send anymore polling messages
         }
     }
@@ -530,11 +530,11 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
                 if self.websocket {
                     DefaultSocketLogger.Logger.log("Writing ws: %@ has data: %@",
                         type: self.logType, args: msg, data.count != 0)
-                    self.sendWebSocketMessage(msg, withType: type, datas: data)
+                    self.sendWebSocketMessage(msg, withType: type, withData: data)
                 } else {
                     DefaultSocketLogger.Logger.log("Writing poll: %@ has data: %@",
                         type: self.logType, args: msg, data.count != 0)
-                    self.sendPollMessage(msg, withType: type, datas: data)
+                    self.sendPollMessage(msg, withType: type, withData: data)
                 }
             }
         }
@@ -710,14 +710,14 @@ extension SocketEngine {
     /// Send polling message.
     /// Only call on emitQueue
     private func sendPollMessage(message: String, withType type: SocketEnginePacketType,
-        datas:[NSData]? = nil) {
+        withData datas: [NSData]) {
             DefaultSocketLogger.Logger.log("Sending poll: %@ as type: %@", type: logType, args: message, type.rawValue)
             let fixedMessage = doubleEncodeUTF8(message)
             let strMsg = "\(type.rawValue)\(fixedMessage)"
             
             postWait.append(strMsg)
             
-            for data in datas ?? [] {
+            for data in datas {
                 if case let .Right(bin) = createBinaryDataForSend(data) {
                     postWait.append(bin)
                 }
@@ -739,12 +739,12 @@ extension SocketEngine {
     /// Send message on WebSockets
     /// Only call on emitQueue
     private func sendWebSocketMessage(str: String, withType type: SocketEnginePacketType,
-        datas:[NSData]? = nil) {
+        withData datas: [NSData]) {
             DefaultSocketLogger.Logger.log("Sending ws: %@ as type: %@", type: logType, args: str, type.rawValue)
             
             ws?.writeString("\(type.rawValue)\(str)")
             
-            for data in datas ?? [] {
+            for data in datas {
                 if case let .Left(bin) = createBinaryDataForSend(data) {
                     ws?.writeData(bin)
                 }
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index f4c386e..6583116 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -112,13 +112,12 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
         engine?.close()
     }
     
-    private func addEngine() -> SocketEngine {
+    private func addEngine() -> SocketEngineSpec {
         DefaultSocketLogger.Logger.log("Adding engine", type: logType)
         
-        let newEngine = SocketEngine(client: self, url: socketURL, options: options ?? [])
+        engine = SocketEngine(client: self, url: socketURL, options: options)
         
-        engine = newEngine
-        return newEngine
+        return engine!
     }
     
     private func clearReconnectTimer() {
diff --git a/Source/SocketLogger.swift b/Source/SocketLogger.swift
index d52f8d0..bbb8578 100644
--- a/Source/SocketLogger.swift
+++ b/Source/SocketLogger.swift
@@ -37,7 +37,7 @@ public protocol SocketLogger: class {
 
 public extension SocketLogger {
     func log(message: String, type: String, args: AnyObject...) {
-        abstractLog("Log", message: message, type: type, args: args)
+        abstractLog("LOG", message: message, type: type, args: args)
     }
     
     func error(message: String, type: String, args: AnyObject...) {
@@ -47,7 +47,7 @@ public extension SocketLogger {
     private func abstractLog(logType: String, message: String, type: String, args: [AnyObject]) {
         guard log else { return }
         
-        let newArgs = args.map {arg -> CVarArgType in String(arg)}
+        let newArgs = args.map({arg -> CVarArgType in String(arg)})
         let replaced = String(format: message, arguments: newArgs)
         
         NSLog("%@ %@: %@", logType, type, replaced)
diff --git a/Source/SocketPacket.swift b/Source/SocketPacket.swift
index 2fa9fd4..c9199c8 100644
--- a/Source/SocketPacket.swift
+++ b/Source/SocketPacket.swift
@@ -55,7 +55,7 @@ struct SocketPacket {
     }
     
     var event: String {
-        return data[0] as? String ?? String(data[0])
+        return String(data[0])
     }
     
     var packetString: String {
@@ -100,9 +100,9 @@ struct SocketPacket {
                 do {
                     let jsonSend = try NSJSONSerialization.dataWithJSONObject(arg,
                         options: NSJSONWritingOptions(rawValue: 0))
-                    let jsonString = NSString(data: jsonSend, encoding: NSUTF8StringEncoding)
+                    let jsonString = String(data: jsonSend, encoding: NSUTF8StringEncoding)
                     
-                    restOfMessage += jsonString! as String + ","
+                    restOfMessage += jsonString! + ","
                 } catch {
                     DefaultSocketLogger.Logger.error("Error creating JSON object in SocketPacket.completeMessage",
                         type: SocketPacket.logType)
@@ -124,30 +124,30 @@ struct SocketPacket {
     }
     
     private func createAck() -> String {
-        let msg: String
+        let message: String
         
-        if type == PacketType.Ack {
+        if type == .Ack {
             if nsp == "/" {
-                msg = "3\(id)["
+                message = "3\(id)["
             } else {
-                msg = "3\(nsp),\(id)["
+                message = "3\(nsp),\(id)["
             }
         } else {
             if nsp == "/" {
-                msg = "6\(binary.count)-\(id)["
+                message = "6\(binary.count)-\(id)["
             } else {
-                msg = "6\(binary.count)-\(nsp),\(id)["
+                message = "6\(binary.count)-\(nsp),\(id)["
             }
         }
         
-        return completeMessage(msg, ack: true)
+        return completeMessage(message, ack: true)
     }
 
     
     private func createMessageForEvent() -> String {
         let message: String
         
-        if type == PacketType.Event {
+        if type == .Event {
             if nsp == "/" {
                 if id == -1 {
                     message = "2["