Add FlightSortByNumberOfStops. Rename FlightSortStrategy to FlightSort. Remove unused imports.