finished refactoring of GPS challenge