Additional code refactoring and geolocation code.