From 31e2f0ea4bd5e48a89e9b0eb6884162638af958d Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Thu, 9 Apr 2015 09:05:23 -0400
Subject: [PATCH] clean up

---
 SwiftIO/SocketIOClient.swift | 11 ++---------
 SwiftIO/SocketParser.swift   |  8 +-------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift
index 290cc49..eefb8b4 100644
--- a/SwiftIO/SocketIOClient.swift
+++ b/SwiftIO/SocketIOClient.swift
@@ -343,15 +343,8 @@ public class SocketIOClient: NSObject, SocketEngineClient {
     
     // Called when the socket gets an ack for something it sent
     func handleAck(ack:Int, data:AnyObject?) {
-        var ackData:[AnyObject]?
-        
-        if data is NSArray {
-            ackData = (data as? [AnyObject]?)!
-        } else if data != nil {
-            ackData = [data!]
-        }
-        
-        self.ackHandlers.executeAck(ack, items: ackData)
+        self.ackHandlers.executeAck(ack,
+            items: data as? [AnyObject]? ?? data != nil ? [data!] : nil)
     }
     
     /**
diff --git a/SwiftIO/SocketParser.swift b/SwiftIO/SocketParser.swift
index a3a468b..3921a44 100644
--- a/SwiftIO/SocketParser.swift
+++ b/SwiftIO/SocketParser.swift
@@ -147,13 +147,7 @@ class SocketParser {
         if ++i < arr.count {
             let d = String(arr[i...arr.count-1])
             let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\""
-            let data:[AnyObject]
-            
-            if let isArr = SocketParser.parseData(noPlaceholders) as? [AnyObject] {
-                data = isArr
-            } else {
-                data = [noPlaceholders]
-            }
+            let data = SocketParser.parseData(noPlaceholders) as? [AnyObject] ?? [noPlaceholders]
             
             return SocketPacket(type: SocketPacketType(str: type), data: data,
                 nsp: nsp, placeholders: placeholders, id: id)