Cleaned up the CityBounder implementation.