Bit of cleanup for compass and heading