GPS Locator

Refactor to simplify