Improvements on AirCalc.c