diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index f59a955..a605cf2 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -83,23 +83,23 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
 
         for option in options {
             switch option {
-            case .SessionDelegate(let delegate):
+            case let .SessionDelegate(delegate):
                 sessionDelegate = delegate
-            case .ForcePolling(let force):
+            case let .ForcePolling(force):
                 forcePolling = force
-            case .ForceWebsockets(let force):
+            case let .ForceWebsockets(force):
                 forceWebsockets = force
-            case .Cookies(let cookies):
+            case let .Cookies(cookies):
                 self.cookies = cookies
-            case .Path(let path):
+            case let .Path(path):
                 socketPath = path
-            case .ExtraHeaders(let headers):
+            case let .ExtraHeaders(headers):
                 extraHeaders = headers
-            case .VoipEnabled(let enable):
+            case let .VoipEnabled(enable):
                 voipEnabled = enable
-            case .Secure(let secure):
+            case let .Secure(secure):
                 self.secure = secure
-            case .SelfSigned(let selfSigned):
+            case let .SelfSigned(selfSigned):
                 self.selfSigned = selfSigned
             default:
                 continue
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index d434424..424c285 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -70,23 +70,23 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
         
         for option in options {
             switch option {
-            case .ConnectParams(let params):
+            case let .ConnectParams(params):
                 connectParams = params
-            case .Reconnects(let reconnects):
+            case let .Reconnects(reconnects):
                 self.reconnects = reconnects
-            case .ReconnectAttempts(let attempts):
+            case let .ReconnectAttempts(attempts):
                 reconnectAttempts = attempts
-            case .ReconnectWait(let wait):
+            case let .ReconnectWait(wait):
                 reconnectWait = abs(wait)
-            case .Nsp(let nsp):
+            case let .Nsp(nsp):
                 self.nsp = nsp
-            case .Log(let log):
+            case let .Log(log):
                 DefaultSocketLogger.Logger.log = log
-            case .Logger(let logger):
+            case let .Logger(logger):
                 DefaultSocketLogger.Logger = logger
-            case .HandleQueue(let queue):
+            case let .HandleQueue(queue):
                 handleQueue = queue
-            case .ForceNew(let force):
+            case let .ForceNew(force):
                 forceNew = force
             default:
                 continue
diff --git a/Source/SocketParser.swift b/Source/SocketParser.swift
index 4faf5d5..4cab27b 100644
--- a/Source/SocketParser.swift
+++ b/Source/SocketParser.swift
@@ -111,7 +111,7 @@ class SocketParser {
         let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\""
         
         switch parseData(noPlaceholders) {
-        case .Left(let err):
+        case let .Left(err):
             // If first you don't succeed, try again
             if case let .Right(data) = parseData("\([noPlaceholders as AnyObject])") {
                 return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
@@ -119,7 +119,7 @@ class SocketParser {
             } else {
                 return .Left(err)
             }
-        case .Right(let data):
+        case let .Right(data):
             return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
                 nsp: namespace ?? "/", placeholders: placeholders))
         }
@@ -147,9 +147,9 @@ class SocketParser {
         DefaultSocketLogger.Logger.log("Parsing %@", type: "SocketParser", args: message)
         
         switch parseString(message) {
-        case .Left(let err):
+        case let .Left(err):
             DefaultSocketLogger.Logger.error("\(err): %@", type: "SocketParser", args: message)
-        case .Right(let pack):
+        case let .Right(pack):
             DefaultSocketLogger.Logger.log("Decoded packet as: %@", type: "SocketParser", args: pack.description)
             handlePacket(pack, withSocket: socket)
         }