Airspeed calculations cleanup