diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index bac32ab..a38aa16 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -359,7 +359,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
         do {
             let json = try openData.toNSDictionary()
             guard let sid = json["sid"] as? String else {
-                client?.engineDidError("Open packet contained no sid")
+                client?.engineDidError(reason: "Open packet contained no sid")
                 return
             }
             
@@ -374,7 +374,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
                 upgradeWs = false
             }
             
-            if let pingInterval = json["pingInterval"] as? Double, pingTimeout = json["pingTimeout"] as? Double {
+            if let pingInterval = json["pingInterval"] as? Double, let pingTimeout = json["pingTimeout"] as? Double {
                 self.pingInterval = pingInterval / 1000.0
                 self.pingTimeout = pingTimeout / 1000.0
             }
@@ -389,7 +389,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
                 doPoll()
             }
             
-            client?.engineDidOpen("Connect")
+            client?.engineDidOpen(reason: "Connect")
         } catch {
             didError(reason: "Error parsing open packet")
         }
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index de61de0..2a8713c 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -151,7 +151,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
         let time = DispatchTime.now() + Double(Int64(timeoutAfter) * Int64(NSEC_PER_SEC)) / Double(NSEC_PER_SEC)
 
         handleQueue.asyncAfter(deadline: time) {[weak self] in
-            guard let this = self where this.status != .Connected && this.status != .Disconnected else { return }
+            guard let this = self, this.status != .connected && this.status != .disconnected else { return }
             
             this.status = .disconnected
             this.engine?.disconnect(reason: "Connect timeout")
diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift
index ae71388..c046893 100644
--- a/Source/SocketParsable.swift
+++ b/Source/SocketParsable.swift
@@ -32,7 +32,7 @@ extension SocketParsable {
         return nsp == self.nsp
     }
     
-    private func handleConnect(packetNamespace: String) {
+    private func handleConnect(_ packetNamespace: String) {
         if packetNamespace == "/" && nsp != "/" {
             joinNamespace(nsp)
         } else {
@@ -53,7 +53,7 @@ extension SocketParsable {
         case .connect:
             handleConnect(pack.nsp)
         case .disconnect:
-            didDisconnect("Got Disconnect")
+            didDisconnect(reason: "Got Disconnect")
         case .error:
             handleEvent("error", data: pack.data, isInternalMessage: true, withAck: pack.id)
         default: