--- a/maxious-canberra-transit-feed/output/18-318-to-lanyon-market-place.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/18-318-to-lanyon-market-place.stop_times.yml
@@ -1,287 +1,8 @@
 --- 
 long_name: To Lanyon Market Place
-between_stops: []
+between_stops: {}
 
-short_name: 18/318
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 714a
-  - 722a
-  - 726a
-  - 736a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 740a
-  - 750a
-  - 755a
-  - 805a
-- - 723a
-  - 725a
-  - 729a
-  - 748a
-  - 805a
-  - 823a
-  - 833a
-  - 838a
-  - 848a
-- - 753a
-  - 755a
-  - 759a
-  - 818a
-  - 835a
-  - 853a
-  - 903a
-  - 908a
-  - 918a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 916a
-  - 926a
-  - 931a
-  - 940a
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 949a
-  - 957a
-  - 1001a
-  - 1010a
-- - 923a
-  - 925a
-  - 929a
-  - 946a
-  - 1003a
-  - 1019a
-  - 1027a
-  - 1031a
-  - 1040a
-- - 953a
-  - 955a
-  - 959a
-  - 1016a
-  - 1033a
-  - 1049a
-  - 1057a
-  - 1101a
-  - 1110a
-- - 1023a
-  - 1025a
-  - 1029a
-  - 1046a
-  - 1103a
-  - 1119a
-  - 1127a
-  - 1131a
-  - 1140a
-- - 1053a
-  - 1055a
-  - 1059a
-  - 1116a
-  - 1133a
-  - 1149a
-  - 1157a
-  - 1201p
-  - 1210p
-- - 1123a
-  - 1125a
-  - 1129a
-  - 1146a
-  - 1203p
-  - 1219p
-  - 1227p
-  - 1231p
-  - 1240p
-- - 1153a
-  - 1155a
-  - 1159a
-  - 1216p
-  - 1233p
-  - 1249p
-  - 1257p
-  - 101p
-  - 110p
-- - 1223p
-  - 1225p
-  - 1229p
-  - 1246p
-  - 103p
-  - 119p
-  - 127p
-  - 131p
-  - 140p
-- - 1253p
-  - 1255p
-  - 1259p
-  - 116p
-  - 133p
-  - 149p
-  - 157p
-  - 201p
-  - 210p
-- - 123p
-  - 125p
-  - 129p
-  - 146p
-  - 203p
-  - 219p
-  - 227p
-  - 231p
-  - 240p
-- - 153p
-  - 155p
-  - 159p
-  - 216p
-  - 233p
-  - 249p
-  - 257p
-  - 301p
-  - 310p
-- - 223p
-  - 225p
-  - 229p
-  - 246p
-  - 303p
-  - 323p
-  - 331p
-  - 335p
-  - 344p
-- - 253p
-  - 255p
-  - 259p
-  - 318p
-  - 335p
-  - 355p
-  - 403p
-  - 407p
-  - 416p
-- - 323p
-  - 325p
-  - 329p
-  - 348p
-  - 405p
-  - 425p
-  - 433p
-  - 437p
-  - 446p
-- - 353p
-  - 355p
-  - 359p
-  - 418p
-  - 435p
-  - 455p
-  - 503p
-  - 507p
-  - 516p
-- - 423p
-  - 425p
-  - 429p
-  - 448p
-  - 505p
-  - 525p
-  - 533p
-  - 537p
-  - 546p
-- - 443p
-  - 445p
-  - 449p
-  - 508p
-  - 525p
-  - 545p
-  - 553p
-  - 557p
-  - 606p
-- - 503p
-  - 505p
-  - 509p
-  - 528p
-  - 545p
-  - 605p
-  - 613p
-  - 617p
-  - 626p
-- - 518p
-  - 520p
-  - 524p
-  - 543p
-  - 600p
-  - 620p
-  - 628p
-  - 632p
-  - 641p
-- - 553p
-  - 555p
-  - 559p
-  - 618p
-  - 634p
-  - 650p
-  - 658p
-  - 702p
-  - 711p
-- - 623p
-  - 625p
-  - 629p
-  - 645p
-  - 659p
-  - 715p
-  - 723p
-  - 727p
-  - 736p
-- - 654p
-  - 656p
-  - 659p
-  - 715p
-  - 729p
-  - 745p
-  - 753p
-  - 757p
-  - 806p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 848p
-  - 856p
-  - 900p
-  - 909p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 948p
-  - 956p
-  - 1000p
-  - 1009p
-- - "-"
-  - "-"
-  - "-"
-  - "-"
-  - "-"
-  - 1048p
-  - 1056p
-  - 1100p
-  - 1109p
-time_points: 
-  - Cohen St Bus Station - Platform 2
-  - Lathlain St Bus Station - Platform 1
-  - Cameron Ave Bus Station - Platform 1
-  - City Interchange - Platform 1
-  - Woden Interchange - Platform 6
-  - Tuggeranong Interchange - Platform 7
-  - Woodcock/Clare Dennis
-  - Gordon Primary
-  - Lanyon Market Place
+short_name: 18 318
+stop_times: [["-", "-", "-", "-", "-", 714a, 722a, 726a, 736a], ["-", "-", "-", "-", "-", 740a, 750a, 755a, 805a], [720a, 722a, 726a, 748a, 805a, 823a, 833a, 838a, 848a], [749a, 751a, 755a, 817a, 834a, 852a, 902a, 907a, 917a], ["-", "-", "-", "-", "-", 916a, 926a, 931a, 940a], ["-", "-", "-", "-", "-", 949a, 957a, 1001a, 1010a], [920a, 922a, 926a, 946a, 1003a, 1019a, 1027a, 1031a, 1040a], [950a, 952a, 956a, 1016a, 1033a, 1049a, 1057a, 1101a, 1110a], [1020a, 1022a, 1026a, 1046a, 1103a, 1119a, 1127a, 1131a, 1140a], [1050a, 1052a, 1056a, 1116a, 1133a, 1149a, 1157a, 1201p, 1210p], [1120a, 1122a, 1126a, 1146a, 1203p, 1219p, 1227p, 1231p, 1240p], [1150a, 1152a, 1156a, 1216p, 1233p, 1249p, 1257p, 101p, 110p], [1220p, 1222p, 1226p, 1246p, 103p, 119p, 127p, 131p, 140p], [1250p, 1252p, 1256p, 116p, 133p, 149p, 157p, 201p, 210p], [120p, 122p, 126p, 146p, 203p, 219p, 227p, 231p, 240p], [150p, 152p, 156p, 216p, 233p, 249p, 257p, 301p, 310p], [220p, 222p, 226p, 246p, 303p, 323p, 331p, 335p, 344p], [250p, 252p, 256p, 318p, 335p, 355p, 403p, 407p, 416p], [320p, 322p, 326p, 348p, 405p, 425p, 433p, 437p, 446p], [350p, 352p, 356p, 418p, 435p, 455p, 503p, 507p, 516p], [420p, 422p, 426p, 448p, 505p, 525p, 533p, 537p, 546p], [440p, 442p, 446p, 508p, 525p, 545p, 553p, 557p, 606p], [500p, 502p, 506p, 528p, 545p, 605p, 613p, 617p, 626p], [515p, 517p, 521p, 543p, 600p, 620p, 628p, 632p, 641p], [550p, 552p, 556p, 618p, 634p, 650p, 658p, 702p, 711p], [620p, 622p, 626p, 645p, 659p, 715p, 723p, 727p, 736p], [650p, 652p, 656p, 715p, 729p, 745p, 753p, 757p, 806p], ["-", "-", "-", "-", "-", 848p, 856p, 900p, 909p], ["-", "-", "-", "-", "-", 948p, 956p, 1000p, 1009p], ["-", "-", "-", "-", "-", 1048p, 1056p, 1100p, 1109p]]
+time_points: [Cohen Street Bus Station (Platform 2), Westfield Bus Station (Platform 1), Belconnen Community Bus Station (Platform 1), City Bus Station (Platform 1), Woden Bus Station (Platform 6), Tuggeranong Bus Station (Platform 7), Woodcock / Clare Dennis, Gordon Primary, Lanyon Market Place]