some tidy up for high rate gps