Clean-up NSString/Concatenation