refactoring to use airline and Command pattern