diff --git a/SwiftIO/SocketAckMap.swift b/SwiftIO/SocketAckMap.swift
index 6e7f932..eac1a90 100644
--- a/SwiftIO/SocketAckMap.swift
+++ b/SwiftIO/SocketAckMap.swift
@@ -39,7 +39,6 @@ struct SocketAckMap {
         
         dispatch_async(dispatch_get_main_queue()) {
             callback?(items)
-            return
         }
         
         acks.removeValueForKey(ack)
diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift
index e1eb0f3..17046bc 100644
--- a/SwiftIO/SocketEngine.swift
+++ b/SwiftIO/SocketEngine.swift
@@ -83,11 +83,11 @@ public class SocketEngine: NSObject, WebSocketDelegate {
         case UPGRADE = 5
         case NOOP = 6
         
-        init(str:String) {
-            if let value = str.toInt() {
+        init?(str:String?) {
+            if let value = str?.toInt() {
                 self = PacketType(rawValue: value)!
             } else {
-                self = PacketType.NOOP
+                return nil
             }
         }
     }
@@ -230,7 +230,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
             if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
                 dispatch_async(self!.parseQueue) {
                     self?.parsePollingMessage(str)
-                    return
                 }
             }
             
@@ -424,7 +423,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
                     // Be sure to capture the value of the msg
                     dispatch_async(self.handleQueue) {[weak self, msg] in
                         self?.parseEngineMessage(msg, fromPolling: true)
-                        return
                     }
                 }
                 
@@ -441,7 +439,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
         
         dispatch_async(self.client!.handleQueue) {[weak self] in
             self?.client?.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1)))
-            return
         }
     }
     
@@ -451,7 +448,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
             fixDoubleUTF8(&message)
         }
         
-        let type = PacketType(str: (message["^(\\d)"].groups()?[1])!)
+        let type = PacketType(str: (message["^(\\d)"].groups()?[1]))
         
         if type == PacketType.MESSAGE {
             // Remove message type
@@ -463,7 +460,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
             
             dispatch_async(self.client!.handleQueue) {[weak self] in
                 self?.client?.parseSocketMessage(message)
-                return
             }
         } else if type == PacketType.NOOP {
             self.doPoll()
@@ -534,7 +530,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
                         
                         dispatch_async(self.client!.handleQueue) {[weak self] in
                             self?.client?.parseBinaryData(data)
-                            return
                         }
                 }
             }
diff --git a/SwiftIO/SocketEventHandler.swift b/SwiftIO/SocketEventHandler.swift
index 34c3086..3a2a75a 100644
--- a/SwiftIO/SocketEventHandler.swift
+++ b/SwiftIO/SocketEventHandler.swift
@@ -43,7 +43,6 @@ class SocketEventHandler {
         withSocket socket:SocketIOClient? = nil) {
             dispatch_async(dispatch_get_main_queue()) {[weak self] in
                 self?.callback?(items, ack != nil ? emitAckCallback(socket!, ack!) : nil)
-                return
             }
     }
 }
\ No newline at end of file
diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift
index 0c431a2..d2cd706 100644
--- a/SwiftIO/SocketIOClient.swift
+++ b/SwiftIO/SocketIOClient.swift
@@ -199,7 +199,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
             
             dispatch_async(self!.emitQueue) {
                 self?._emit(event, items, ack: ack)
-                return
             }
             
             if timeout != 0 {
@@ -207,7 +206,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
                 
                 dispatch_after(time, dispatch_get_main_queue()) {
                     self?.ackHandlers.timeoutAck(ack)
-                    return
                 }
             }
         }
@@ -245,7 +243,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
         
         dispatch_async(self.emitQueue) {[weak self] in
             self?._emit(event, items)
-            return
         }
     }
     
@@ -259,7 +256,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
         
         dispatch_async(self.emitQueue) {[weak self] in
             self?._emit(event, items)
-            return
         }
     }
     
@@ -370,7 +366,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
             if self.anyHandler != nil {
                 dispatch_async(dispatch_get_main_queue()) {[weak self] in
                     self?.anyHandler?(SocketAnyEvent(event: event, items: data))
-                    return
                 }
             }
             
diff --git a/SwiftIO/SocketParser.swift b/SwiftIO/SocketParser.swift
index 5be39ba..e8db528 100644
--- a/SwiftIO/SocketParser.swift
+++ b/SwiftIO/SocketParser.swift
@@ -183,11 +183,7 @@ class SocketParser {
         }
 
         func checkNSP(nsp:String) -> Bool {
-            if nsp == "" && socket.nsp != "/" {
-                return true
-            } else {
-                return false
-            }
+            return nsp == "" && socket.nsp != "/"
         }
 
         let p = parseString(stringMessage) as SocketPacket!