Refactor Altimeter