Refactor Aircraft