--- a/maxious-canberra-transit-feed/output/15-315-to-spence-terminus.stop_times.yml
+++ b/maxious-canberra-transit-feed/output/15-315-to-spence-terminus.stop_times.yml
@@ -1,298 +1,8 @@
 --- 
 long_name: To Spence Terminus
-between_stops: []
+between_stops: {}
 
-short_name: 15/315
-stop_times: 
-- - "-"
-  - "-"
-  - "-"
-  - 723a
-  - 725a
-  - 729a
-  - 737a
-  - 741a
-  - 749a
-  - 754a
-- - "-"
-  - "-"
-  - "-"
-  - 803a
-  - 805a
-  - 809a
-  - 817a
-  - 821a
-  - 829a
-  - 834a
-- - 731a
-  - 750a
-  - 808a
-  - 826a
-  - 828a
-  - 832a
-  - 840a
-  - 844a
-  - 852a
-  - 857a
-- - 831a
-  - 850a
-  - 908a
-  - 926a
-  - 928a
-  - 932a
-  - 939a
-  - 942a
-  - 948a
-  - 953a
-- - 911a
-  - 930a
-  - 946a
-  - 1003a
-  - 1005a
-  - 1009a
-  - 1016a
-  - 1019a
-  - 1025a
-  - 1030a
-- - 941a
-  - 959a
-  - 1015a
-  - 1032a
-  - 1034a
-  - 1038a
-  - 1045a
-  - 1048a
-  - 1054a
-  - 1059a
-- - 1011a
-  - 1029a
-  - 1045a
-  - 1102a
-  - 1104a
-  - 1108a
-  - 1115a
-  - 1118a
-  - 1124a
-  - 1129a
-- - 1041a
-  - 1059a
-  - 1115a
-  - 1132a
-  - 1134a
-  - 1138a
-  - 1145a
-  - 1148a
-  - 1154a
-  - 1159a
-- - 1111a
-  - 1129a
-  - 1145a
-  - 1202p
-  - 1204p
-  - 1208p
-  - 1215p
-  - 1218p
-  - 1224p
-  - 1229p
-- - 1141a
-  - 1159a
-  - 1215p
-  - 1232p
-  - 1234p
-  - 1238p
-  - 1245p
-  - 1248p
-  - 1254p
-  - 1259p
-- - 1211p
-  - 1229p
-  - 1245p
-  - 102p
-  - 104p
-  - 108p
-  - 115p
-  - 118p
-  - 124p
-  - 129p
-- - 1241p
-  - 1259p
-  - 115p
-  - 132p
-  - 134p
-  - 138p
-  - 145p
-  - 148p
-  - 154p
-  - 159p
-- - 111p
-  - 129p
-  - 145p
-  - 202p
-  - 204p
-  - 208p
-  - 215p
-  - 218p
-  - 224p
-  - 229p
-- - 141p
-  - 159p
-  - 215p
-  - 232p
-  - 234p
-  - 238p
-  - 245p
-  - 248p
-  - 254p
-  - 259p
-- - 211p
-  - 229p
-  - 245p
-  - 302p
-  - 304p
-  - 308p
-  - 316p
-  - 320p
-  - 328p
-  - 333p
-- - 241p
-  - 259p
-  - 317p
-  - 335p
-  - 337p
-  - 341p
-  - 349p
-  - 353p
-  - 401p
-  - 406p
-- - "-"
-  - "-"
-  - "-"
-  - 354p
-  - 356p
-  - 400p
-  - 408p
-  - 412p
-  - 420p
-  - 425p
-- - 311p
-  - 330p
-  - 348p
-  - 406p
-  - 408p
-  - 412p
-  - 420p
-  - 424p
-  - 432p
-  - 437p
-- - 341p
-  - 400p
-  - 418p
-  - 436p
-  - 438p
-  - 442p
-  - 450p
-  - 454p
-  - 502p
-  - 507p
-- - 411p
-  - 430p
-  - 448p
-  - 506p
-  - 508p
-  - 512p
-  - 520p
-  - 524p
-  - 532p
-  - 537p
-- - 441p
-  - 500p
-  - 518p
-  - 536p
-  - 538p
-  - 542p
-  - 550p
-  - 554p
-  - 602p
-  - 607p
-- - 501p
-  - 520p
-  - 538p
-  - 556p
-  - 558p
-  - 602p
-  - 610p
-  - 614p
-  - 622p
-  - 627p
-- - 521p
-  - 540p
-  - 558p
-  - 616p
-  - 618p
-  - 622p
-  - 630p
-  - 633p
-  - 639p
-  - 644p
-- - 601p
-  - 620p
-  - 636p
-  - 653p
-  - 655p
-  - 658p
-  - 705p
-  - 708p
-  - 714p
-  - 719p
-- - "-"
-  - "-"
-  - "-"
-  - 753p
-  - 755p
-  - 758p
-  - 805p
-  - 808p
-  - 814p
-  - 819p
-- - "-"
-  - "-"
-  - "-"
-  - 853p
-  - 855p
-  - 858p
-  - 905p
-  - 908p
-  - 914p
-  - 919p
-- - "-"
-  - "-"
-  - "-"
-  - 953p
-  - 955p
-  - 958p
-  - 1005p
-  - 1008p
-  - 1014p
-  - 1019p
-- - "-"
-  - "-"
-  - "-"
-  - 1053p
-  - 1055p
-  - 1058p
-  - 1105p
-  - 1108p
-  - 1114p
-  - 1119p
-time_points: 
-  - Tuggeranong Interchange - Platform 8
-  - Woden Interchange - Platform 9
-  - City Interchange - Platform 5
-  - Cameron Ave Bus Station - Platform 4
-  - Lathlain St Bus Station - Platform 4
-  - Cohen St Bus Station - Platform 6
-  - Copland College
-  - Melba
-  - Spence
-  - Spence Terminus
+short_name: 15 315
+stop_times: [["-", "-", "-", 723a, 725a, 729a, 737a, 741a, 749a, 755a], ["-", "-", "-", 803a, 805a, 809a, 817a, 821a, 829a, 835a], [731a, 750a, 808a, 829a, 831a, 835a, 843a, 847a, 855a, 901a], [831a, 850a, 908a, 929a, 931a, 935a, 942a, 945a, 951a, 957a], [911a, 930a, 946a, 1006a, 1008a, 1012a, 1019a, 1022a, 1028a, 1034a], [941a, 959a, 1015a, 1035a, 1037a, 1041a, 1048a, 1051a, 1057a, 1103a], [1011a, 1029a, 1045a, 1105a, 1107a, 1111a, 1118a, 1121a, 1127a, 1133a], [1041a, 1059a, 1115a, 1135a, 1137a, 1141a, 1148a, 1151a, 1157a, 1203p], [1111a, 1129a, 1145a, 1205p, 1207p, 1211p, 1218p, 1221p, 1227p, 1233p], [1141a, 1159a, 1215p, 1235p, 1237p, 1241p, 1248p, 1251p, 1257p, 103p], [1211p, 1229p, 1245p, 105p, 107p, 111p, 118p, 121p, 127p, 133p], [1241p, 1259p, 115p, 135p, 137p, 141p, 148p, 151p, 157p, 203p], [111p, 129p, 145p, 205p, 207p, 211p, 218p, 221p, 227p, 233p], [141p, 159p, 215p, 235p, 237p, 241p, 248p, 251p, 257p, 303p], [211p, 229p, 245p, 305p, 307p, 311p, 319p, 323p, 331p, 337p], [240p, 258p, 316p, 337p, 339p, 343p, 351p, 355p, 403p, 409p], ["-", "-", "-", 357p, 359p, 403p, 411p, 415p, 423p, 429p], [311p, 330p, 348p, 409p, 411p, 415p, 423p, 427p, 435p, 441p], [341p, 400p, 418p, 439p, 441p, 445p, 453p, 457p, 505p, 511p], [411p, 430p, 448p, 509p, 511p, 515p, 523p, 527p, 535p, 541p], [441p, 500p, 518p, 539p, 541p, 545p, 553p, 557p, 605p, 611p], [501p, 520p, 538p, 559p, 601p, 605p, 613p, 617p, 625p, 631p], [521p, 540p, 558p, 619p, 621p, 625p, 633p, 636p, 642p, 648p], [601p, 620p, 636p, 656p, 658p, 702p, 709p, 712p, 718p, 724p], ["-", "-", "-", 728p, 730p, 734p, 741p, 744p, 750p, 756p], ["-", "-", "-", 804p, 806p, 810p, 817p, 820p, 826p, 832p], ["-", "-", "-", 904p, 906p, 910p, 917p, 920p, 926p, 932p], ["-", "-", "-", 1004p, 1006p, 1010p, 1017p, 1020p, 1026p, 1032p], ["-", "-", "-", 1104p, 1106p, 1110p, 1117p, 1120p, 1126p, 1132p], [Operates School Days Only and departs Radford College at 352p]]
+time_points: [Tuggeranong Bus Station (Platform 8), Woden Bus Station (Platform 9), City Bus Station (Platform 3), Belconnen Community Bus Station (Platform 4), Westfield Bus Station (Platform 2), Cohen Street Bus Station (Platform 6), Copland College, Melba Shops, Spence Shops, Spence Terminus]