GeolocationService code refactoring.