Heavyish refactoring and sanitizing of GPS data import