--- a/maxious-canberra-transit-feed/output/65-to-citywest.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/65-to-citywest.stop_times.yml
@@ -1,251 +1,8 @@
 --- 
 long_name: To Citywest
-between_stops: []
+between_stops: {}
 
 short_name: "65"
-stop_times: 
-- - 535a
-  - 541a
-  - 552a
-  - 557a
-  - 611a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 635a
-  - 641a
-  - 652a
-  - 657a
-  - 711a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 653a
-  - 700a
-  - 712a
-  - 721a
-  - 737a
-  - 752a
-  - 756a
-  - 805a
-  - 808a
-- - 720a
-  - 726a
-  - 734a
-  - 743a
-  - 801a
-  - 815a
-  - 819a
-  - 829a
-  - 832a
-- - 730a
-  - 739a
-  - 756a
-  - 805a
-  - 822a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 745a
-  - 754a
-  - 811a
-  - 820a
-  - 842a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 815a
-  - 824a
-  - 841a
-  - 850a
-  - 907a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 845a
-  - 854a
-  - 911a
-  - 920a
-  - 936a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 945a
-  - 952a
-  - 1005a
-  - 1012a
-  - 1027a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1045a
-  - 1052a
-  - 1105a
-  - 1112a
-  - 1127a
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1145a
-  - 1152a
-  - 1205p
-  - 1212p
-  - 1227p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1245p
-  - 1252p
-  - 105p
-  - 112p
-  - 127p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 145p
-  - 152p
-  - 205p
-  - 212p
-  - 227p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 245p
-  - 252p
-  - 305p
-  - 312p
-  - 331p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 315p
-  - 324p
-  - 337p
-  - 344p
-  - 403p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 345p
-  - 354p
-  - 407p
-  - 414p
-  - 433p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 420p
-  - 429p
-  - 442p
-  - 449p
-  - 508p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 445p
-  - 454p
-  - 507p
-  - 514p
-  - 533p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 515p
-  - 524p
-  - 537p
-  - 544p
-  - 603p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 545p
-  - 554p
-  - 607p
-  - 614p
-  - 633p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 615p
-  - 624p
-  - 636p
-  - 641p
-  - 657p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 641p
-  - 647p
-  - 659p
-  - 704p
-  - 720p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 741p
-  - 747p
-  - 759p
-  - 804p
-  - 820p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 841p
-  - 847p
-  - 859p
-  - 904p
-  - 920p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 941p
-  - 947p
-  - 959p
-  - 1004p
-  - 1020p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-- - 1041p
-  - 1047p
-  - 1059p
-  - 1104p
-  - 1120p
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-time_points: 
-  - Tuggeranong Interchange - Platform 5
-  - MacKillop College Isabella Campus
-  - Gowrie
-  - Erindale Centre /Sternberg Crescent
-  - Woden Interchange - Platform 10
-  - Kings Ave/National Crt
-  - Russell Offices
-  - City Interchange
-  - Citywest
+stop_times: [[535a, 541a, 552a, 557a, 611a, "-", "-", "-", "-"], [635a, 641a, 652a, 657a, 711a, "-", "-", "-", "-"], [653a, 700a, 712a, 721a, 737a, 752a, 756a, 805a, 808a], [720a, 726a, 734a, 743a, 801a, 815a, 819a, 829a, 832a], [730a, 739a, 756a, 805a, 822a, "-", "-", "-", "-"], [745a, 754a, 811a, 820a, 842a, "-", "-", "-", "-"], [815a, 824a, 841a, 850a, 907a, "-", "-", "-", "-"], [845a, 854a, 911a, 920a, 936a, "-", "-", "-", "-"], [945a, 952a, 1005a, 1012a, 1027a, "-", "-", "-", "-"], [1045a, 1052a, 1105a, 1112a, 1127a, "-", "-", "-", "-"], [1145a, 1152a, 1205p, 1212p, 1227p, "-", "-", "-", "-"], [1245p, 1252p, 105p, 112p, 127p, "-", "-", "-", "-"], [145p, 152p, 205p, 212p, 227p, "-", "-", "-", "-"], [245p, 252p, 305p, 312p, 331p, "-", "-", "-", "-"], [315p, 324p, 337p, 344p, 403p, "-", "-", "-", "-"], [345p, 354p, 407p, 414p, 433p, "-", "-", "-", "-"], [420p, 429p, 442p, 449p, 508p, "-", "-", "-", "-"], [445p, 454p, 507p, 514p, 533p, "-", "-", "-", "-"], [515p, 524p, 537p, 544p, 603p, "-", "-", "-", "-"], [545p, 554p, 607p, 614p, 633p, "-", "-", "-", "-"], [615p, 624p, 636p, 641p, 657p, "-", "-", "-", "-"], [641p, 647p, 659p, 704p, 720p, "-", "-", "-", "-"], [741p, 747p, 759p, 804p, 820p, "-", "-", "-", "-"], [841p, 847p, 859p, 904p, 920p, "-", "-", "-", "-"], [941p, 947p, 959p, 1004p, 1020p, "-", "-", "-", "-"], [1041p, 1047p, 1059p, 1104p, 1120p, "-", "-", "-", "-"]]
+time_points: [Tuggeranong Interchange - Platform 5, MacKillop College Isabella Campus, Gowrie, Erindale Drive/Sternberg, Woden Interchange - Platform 10, Kings Ave/National Crt, Russell Offices, City Interchange, Citywest]