geo_location refactored