diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift
index 5cd93fb..ebc4aad 100644
--- a/SocketIOClientSwift/SocketEngine.swift
+++ b/SocketIOClientSwift/SocketEngine.swift
@@ -137,13 +137,13 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
 
             mutData.appendData(data)
 
-            return Either.Left(mutData)
+            return .Left(mutData)
         } else {
             var str = "b4"
             str += data.base64EncodedStringWithOptions(
                 NSDataBase64EncodingOptions.Encoding64CharacterLineLength)
 
-            return Either.Right(str)
+            return .Right(str)
         }
     }
 
@@ -581,7 +581,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
             postWait.append(strMsg)
 
             for data in datas ?? [] {
-                if case let Either.Right(bin) = createBinaryDataForSend(data) {
+                if case let .Right(bin) = createBinaryDataForSend(data) {
                     postWait.append(bin)
                 }
             }
diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift
index bc2ca1f..8582531 100644
--- a/SocketIOClientSwift/SocketParser.swift
+++ b/SocketIOClientSwift/SocketParser.swift
@@ -63,8 +63,9 @@ class SocketParser {
     static func parseString(message: String) -> Either<String, SocketPacket> {
         var parser = SocketStringReader(message: message)
         
-        guard let type = SocketPacket.PacketType(str: parser.read(1))
-            else {return .Left("Invalid packet type \(message)")}
+        guard let type = SocketPacket.PacketType(str: parser.read(1)) else {
+            return .Left("Invalid packet type")
+        }
         
         if !parser.hasNext {
             return .Right(SocketPacket(type: type, nsp: "/"))
@@ -77,7 +78,7 @@ class SocketParser {
             if let holders = Int(parser.readUntilStringOccurence("-")) {
                 placeholders = holders
             } else {
-               return .Left("Invalid packet: \(message)")
+               return .Left("Invalid packet")
             }
         }
         
@@ -114,7 +115,7 @@ class SocketParser {
     }
     
     // Parses data for events
-    static func parseData(data: String) -> Either<String, [AnyObject]> {
+    private static func parseData(data: String) -> Either<String, [AnyObject]> {
         let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
         do {
             if let arr = try NSJSONSerialization.JSONObjectWithData(stringData!,