airplane movement + refactoring