General cleanup, messing with altimeter code