Refactor FlightWayParser