Flight (minor refactoring on the airplane)