diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 5010828..25ea32c 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -17,33 +17,36 @@
     </div>
 
     {{ if .Params.tags }}
-      <span class="post-tags">
-        {{ range .Params.tags }}
-        #<a href="{{ (urlize (printf "tags/%s/" . )) | absURL }}">{{ . }}</a>&nbsp;
-        {{ end }}
-      </span>
+    <span class="post-tags">
+      {{ range .Params.tags }}
+      #<a href="{{ (urlize (printf "tags/%s/" . )) | absURL }}">
+        {{- . -}}
+      </a>&nbsp;
+      {{ end }}
+    </span>
     {{ end }}
 
     {{ with .Params.Cover }}
-      <img src="{{ . | absURL }}" class="post-cover" />
+    <img src="{{ . | absURL }}" class="post-cover" />
     {{ end }}
 
     <div class="post-content">
       {{ if .Params.showFullContent }}
-        {{ .Content | markdownify }}
+      {{ .Content | markdownify }}
       {{ else if .Description }}
-        {{ .Description | markdownify }}
+      {{ .Description | markdownify }}
       {{ else }}
-        {{ if .Truncated }}
-          {{ .Summary | markdownify }}
-        {{ end }}
+      {{ if .Truncated }}
+      {{ .Summary | markdownify }}
+      {{ end }}
       {{ end }}
     </div>
 
     {{ if not .Params.showFullContent }}
-      <div>
-        <a class="read-more button" href="{{.RelPermalink}}">{{ $.Site.Params.ReadMore }} →</a>
-      </div>
+    <div>
+      <a class="read-more button"
+        href="{{.RelPermalink}}">{{ $.Site.Params.ReadMore }} →</a>
+    </div>
     {{ end }}
   </div>
   {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 700d737..dafde5a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,61 +1,67 @@
 {{ define "main" }}
-  <div class="post">
-    <h1 class="post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h1>
-    <div class="post-meta">
-      <span class="post-date">
-        {{ .Date.Format "2006-01-02" }}
-      </span>
-      {{ with .Params.Author }}<span class="post-author">:: {{ . }}</span>{{ end }}
-    </div>
-
-    {{ if .Params.tags }}
-      <span class="post-tags">
-        {{ range .Params.tags }}
-          #<a href="{{ (urlize (printf "tags/%s/" .)) | absURL }}">{{ . }}</a>&nbsp;
-        {{ end }}
-      </span>
+<div class="post">
+  <h1 class="post-title">
+    <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h1>
+  <div class="post-meta">
+    <span class="post-date">
+      {{ .Date.Format "2006-01-02" }}
+    </span>
+    {{ with .Params.Author }}
+    <span class="post-author">::
+      {{ . }}
+    </span>
     {{ end }}
-
-    {{ with .Params.Cover }}
-      <img src="{{ . | absURL }}" class="post-cover" />
-    {{ end }}
-
-        {{ if .Params.Toc }}
-	    <div class="table-of-contents">
-	      {{ .TableOfContents }}
-	    </div>
-	    {{ end }}
-
-    <div class="post-content">
-      {{ .Content }}
-    </div>
-    {{ if or .NextInSection .PrevInSection }}
-      <div class="pagination">
-        <div class="pagination__title">
-          <span class="pagination__title-h">{{ $.Site.Params.ReadOtherPosts }}</span>
-          <hr />
-        </div>
-        <div class="pagination__buttons">
-          {{ if .NextInSection }}
-            <span class="button previous">
-              <a href="{{ .NextInSection.Permalink }}">
-                <span class="button__icon">←</span>
-                <span class="button__text">{{ .NextInSection.Title }}</span>
-              </a>
-            </span>
-          {{ end }}
-          {{ if .PrevInSection }}
-            <span class="button next">
-              <a href="{{ .PrevInSection.Permalink }}">
-                <span class="button__text">{{ .PrevInSection.Title }}</span>
-                <span class="button__icon">→</span>
-              </a>
-            </span>
-          {{ end }}
-        </div>
-      </div>
-    {{ end }}
-
-    {{ partial "comments.html" . }}
   </div>
+
+  {{ if .Params.tags }}
+  <span class="post-tags">
+    {{ range .Params.tags }}
+    #<a href="{{ (urlize (printf "tags/%s/" .)) | absURL }}">{{ . }}</a>&nbsp;
+    {{ end }}
+  </span>
+  {{ end }}
+
+  {{ with .Params.Cover }}
+  <img src="{{ . | absURL }}" class="post-cover" />
+  {{ end }}
+
+  {{ if .Params.Toc }}
+  <div class="table-of-contents">
+    {{ .TableOfContents }}
+  </div>
+  {{ end }}
+
+  <div class="post-content">
+    {{ .Content }}
+  </div>
+  {{ if or .NextInSection .PrevInSection }}
+  <div class="pagination">
+    <div class="pagination__title">
+      <span
+        class="pagination__title-h">{{ $.Site.Params.ReadOtherPosts }}</span>
+      <hr />
+    </div>
+    <div class="pagination__buttons">
+      {{ if .NextInSection }}
+      <span class="button previous">
+        <a href="{{ .NextInSection.Permalink }}">
+          <span class="button__icon">←</span>
+          <span class="button__text">{{ .NextInSection.Title }}</span>
+        </a>
+      </span>
+      {{ end }}
+      {{ if .PrevInSection }}
+      <span class="button next">
+        <a href="{{ .PrevInSection.Permalink }}">
+          <span class="button__text">{{ .PrevInSection.Title }}</span>
+          <span class="button__icon">→</span>
+        </a>
+      </span>
+      {{ end }}
+    </div>
+  </div>
+  {{ end }}
+
+  {{ partial "comments.html" . }}
+</div>
 {{ end }}