diff --git a/source/schedule.html.twig b/source/schedule.html.twig
index 9575035..378751c 100644
--- a/source/schedule.html.twig
+++ b/source/schedule.html.twig
@@ -3,45 +3,45 @@ layout: default
 title: Schedule
 classes:
     Monday:
-        - { time: 7.00am, description: Jiu-jitsu, type: adults }
-        - { time: 11.00am, description: Jiu-jitsu, type: adults }
-        - { time: 12.00pm, description: Live training, type: adults }
-        - { time: 4.00pm, description: Open mat, type: adults }
-        - { time: 6.00pm, description: Jiu-jitsu, type: adults }
-        - { time: 7.00pm, description: Live training, type: adults }
-        - { time: 8.00pm, description: Fundamentals, type: adults }
+        - { time: 7.00am,  type: adults, description: 'Jiu-jitsu' }
+        - { time: 11.00am, type: adults, description: 'Jiu-jitsu' }
+        - { time: 12.00pm, type: adults, description: 'Live training' }
+        - { time: 4.00pm,  type: adults, description: 'Open mat' }
+        - { time: 6.00pm,  type: adults, description: 'Jiu-jitsu' }
+        - { time: 7.00pm,  type: adults, description: 'Live training' }
+        - { time: 8.00pm,  type: adults, description: 'Fundamentals' }
     Tuesday:
-        - { time: 5.45pm, description: Kids 4 to 6, type: kids }
-        - { time: 6:30pm, description: Kids 7 to 10, type: kids }
-        - { time: 7.15pm, description: Kids 11+, type: kids }
-        - { time: 8.00pm, description: Adults jiu-jitsu, type: adults }
+        - { time: 5.45pm, type: kids,   description: 'Kids 4 to 6' }
+        - { time: 6:30pm, type: kids,   description: 'Kids 7 to 10' }
+        - { time: 7.15pm, type: kids,   description: 'Kids 11+' }
+        - { time: 8.00pm, type: adults, description: 'Adults jiu-jitsu' }
     Wednesday:
-        - { time: 7.00am, description: Jiu-jitsu, type: adults }
-        - { time: 11.00am, description: Jiu-jitsu, type: adults }
-        - { time: 12.00am, description: Live training, type: adults }
-        - { time: 4.00pm, description: Open mat, type: adults }
-        - { time: 6.00pm, description: Nogi jiu-jitsu, type: adults }
-        - { time: 7.30pm, description: Gi jiu-jitsu, type: adults }
+        - { time: 7.00am,  type: adults, description: 'Jiu-jitsu' }
+        - { time: 11.00am, type: adults, description: 'Jiu-jitsu' }
+        - { time: 12.00am, type: adults, description: 'Live training' }
+        - { time: 4.00pm,  type: adults, description: 'Open mat' }
+        - { time: 6.00pm,  type: adults, description: 'Nogi jiu-jitsu' }
+        - { time: 7.30pm,  type: adults, description: 'Gi jiu-jitsu' }
     Thursday:
-        - { time: 11.00am, description: Jiu-jitsu, type: adults }
-        - { time: 12.00pm, description: Live training, type: adults }
-        - { time: 5.00pm, description: Kids 7+ open mat, type: kids }
-        - { time: 5.30pm, description: Kids 7+, type: kids }
-        - { time: 6.30pm, description: Fundamentals, type: adults }
-        - { time: 8.00pm, description: Advanced, type: adults }
+        - { time: 11.00am, type: adults, description: 'Jiu-jitsu' }
+        - { time: 12.00pm, type: adults, description: 'Live training' }
+        - { time: 5.00pm,  type: kids,   description: 'Kids 7+ open mat' }
+        - { time: 5.30pm,  type: kids,   description: 'Kids 7+' }
+        - { time: 6.30pm,  type: adults, description: 'Fundamentals' }
+        - { time: 8.00pm,  type: adults, description: 'Advanced' }
     Friday:
-        - { time: 7.00am, description: Jiu-jitsu, type: adults }
-        - { time: 11.00am, description: Jiu-jitsu, type: adults }
-        - { time: 12.00am, description: Live training, type: adults }
-        - { time: 6.30pm, description: Jiu-jitsu, type: adults }
+        - { time: 7.00am,  type: adults, description: 'Jiu-jitsu' }
+        - { time: 11.00am, type: adults, description: 'Jiu-jitsu' }
+        - { time: 12.00am, type: adults, description: 'Live training' }
+        - { time: 6.30pm,  type: adults, description: 'Jiu-jitsu' }
     Saturday:
-        - { time: 9.00am, description: Kids 4 to 6, type: kids }
-        - { time: 9.45am, description: Kids 7 to 10, type: kids }
-        - { time: 10:30am, description: Kids 11+, type: kids }
-        - { time: 11.15pm, description: Jiu-jitsu, type: adults }
+        - { time: 9.00am,  type: kids,   description: 'Kids 4 to 5' }
+        - { time: 9.45am,  type: kids,   description: 'Kids 7 to 9' }
+        - { time: 10:30am, type: kids,   description: 'Kids 11+' }
+        - { time: 11.15pm, type: adults, description: 'Jiu-jitsu' }
     Sunday:
-        - { time: 10.00am, description: Jiu-jitsu, type: adults }
-        - { time: 4.00pm, description: Women only jiu-jitsu, type: adults }
+        - { time: 10.00am, type: adults, description: 'Jiu-jitsu' }
+        - { time: 4.00pm,  type: adults, description: 'Women only jiu-jitsu' }
 ---
 <h1 class="uppercase text-red-dark">Class Schedule</h1>