diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index 49bc3cee..c7dfc8eb 100644
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -24,15 +24,15 @@
         {% if media.tags|length > 1 %}
           {% trans %}and{% endtrans %}
         {% endif %}
-
         <a href="{{ request.urlgen(
                           'mediagoblin.listings.tags_listing',
                           tag=tag['slug']) }}">{{ tag['name'] }}</a>.
-        {% elif loop.revindex==2 %}
+      {% elif loop.revindex == 2 %}
         <a href="{{ request.urlgen(
                           'mediagoblin.listings.tags_listing',
                           tag=tag['slug']) }}">{{ tag['name'] }}</a> 
-        {% else %}<a href="{{ request.urlgen(
+      {% else %}
+        <a href="{{ request.urlgen(
                           'mediagoblin.listings.tags_listing',
                           tag=tag['slug']) }}">{{ tag['name'] }}</a>, 
       {% endif %}