Refactoring the geolocatable methods