cleaned up the cities and time zone formats