Minor refactor of GPS