Small Refactoring
Refactoring GPS