began refactoring and documenting CityMap