Refactored GeoLocation a bit