Geocode service refactoring