 
 	// maps a JSON array to an object that conforms to Mappable
 	public func mapArray(string JSONString: String) -> [N]! {
-		var jsonArray = parseJSONArray(JSONString)
-		if let jsonArray = jsonArray {
-			return mapArray(jsonArray)
+		let JSONArray = parseJSONArray(JSONString)
+		if let JSONArray = JSONArray {
+			return mapArray(JSONArray)
 		} else {
 			// failed to parse JSON into array form
 			// try to parse it into a dictionary and then wrap it in an array
-			var jsonDict = parseJSONDictionary(JSONString)
-			if let jsonDict = jsonDict {
-				return mapArray([jsonDict])
+			let JSONDict = parseJSONDictionary(JSONString)
+			if let JSONDict = JSONDict {
+				return mapArray([JSONDict])
 			}
 		}
+
 		return nil
 	}
 	

        
        var err: NSError?
        if NSJSONSerialization.isValidJSONObject(JSONDict) {
            var options = prettyPrint ? NSJSONWritingOptions.PrettyPrinted : NSJSONWritingOptions.allZeros
            var jsonData: NSData? = NSJSONSerialization.dataWithJSONObject(JSONDict, options: options, error: &err)
            if let error = err {
                println(error)
            }
            
            if let json = jsonData {
                return NSString(data: json, encoding: NSUTF8StringEncoding)
            }
        }
        return nil
    }
    

	public func mapArray(JSON: [[String : AnyObject]]) -> [N] {
		mappingType = .fromJSON
		
		var objects = [N]()
		
		for innerJSON in JSON {
			self.JSONDictionary = innerJSON
