diff --git a/templates/index.html.tera b/templates/index.html.tera
index 698106b..4363870 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -20,22 +20,21 @@
                 kyujitai = !kyujitai;
             }
         </script>
-        <button onclick="kyujitaiToggle(); this.innerHTML = kyujitai ? '新字体' : '旧字体'"">旧字体</button>
+        <button onclick="kyujitaiToggle(); this.innerHTML = kyujitai ? '新字体' : '旧字体'">旧字体</button>
         {% for line in content.japanese %}
             {% for subline in line %}
                 <p>
-                    {% for word in subline %}
-                        {% if word.dictionary %}
+                    {%- for word in subline -%}
+                        {%- if word.dictionary -%}
                             <a href="{{ word.dictionary }}" target="_blank"{% if word.pos %} class="{{ word.pos }}" title="{{ word.pos }}"{% endif %}>
-                        {% endif %}
-                        {% for segment in word.text %}
-                            <!-- TODO: Don't use ruby for all segments -->
+                        {%- endif -%}
+                        {% for segment in word.text -%}
                             <ruby{% if segment.kyujitai %} data-kyujitai="{{ segment.kyujitai }}"{% endif %}>{{ segment.kanji }}<rp>(</rp><rt>{{ segment.furigana | safe }}</rt><rp>)</rp></ruby>
-                        {% endfor %}
-                        {% if word.dictionary %}
+                        {%- endfor -%}
+                        {%- if word.dictionary -%}
                             </a>
-                        {% endif %}
-                    {% endfor %}
+                        {%- endif -%}
+                    {%- endfor -%}
                 </p>
             {% endfor %}
         {% endfor %}
@@ -50,11 +49,11 @@
                 {% else %}
                     {{ content.translation.site.name }}
                 {% endif %}
-            {% endif %}
+            {%- endif -%}
         </p>
-    {% endif %}
-    {% if content.suggester %}
+    {%- endif -%}
+    {%- if content.suggester -%}
         <p><em>This challenge was suggested by <strong>{{ content.suggester }}</strong> using the <code>-h suggest</code> command.</code></em></p>
-    {% endif %}
+    {%- endif -%}
 </body>
 </html>
\ No newline at end of file