refactored airplane