Tweak parser, Small Refactor

Fixed Parser error or addition expressions.  Separate out code
formatting for NSString, NSDictionary, and NSArray