Code review items
Cleaning up the geolocation code and removing test files