Refactor to create geocoding to its own methods