Refactoring sub flight planners