refactor Flights
refactor time