Tidy structure of timetable in API service

magic