Refactoring geocoding