Refactored GTFS rakes