Convert city and state to proper format