Refactoring, gtfs work
Small fix