Refactor city.json