DRYed up code and added gsub to city and state