Refactor FlightPlan