Improve city and nation variable names