refactoring gps lokation