Refactored code to be a little cleaner, removed duplicate code
Changed Carrier filter to Arrival Time filter