Refactor geolocation to prepare actor for uplifting