diff --git a/layouts/_default/_markup/render-image.html.example b/layouts/_default/_markup/render-image.html.example
index 77731f4..3bf4c7d 100644
--- a/layouts/_default/_markup/render-image.html.example
+++ b/layouts/_default/_markup/render-image.html.example
@@ -49,7 +49,7 @@
     {{ range $set := split $srcset " " -}}
       {{ $image := $resource.Resize (printf "%sx" $set) -}}
       {{ $srcsetw = $srcsetw | append (printf "%s %sw" $image.RelPermalink $set) -}}
-    {{ end }}
+    {{ end -}}
     {{ $width = "" -}}
     {{ $height = "" -}}
   {{ end -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index dc28413..43ed71b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -17,4 +17,4 @@
 
 {{ partial "pagination.html" . }}
 </main>
-{{ end }}
+{{ end -}}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 09b04cc..2f86d8f 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -16,10 +16,10 @@
     <language>{{ . }}</language>
     {{ end -}}
     {{ with site.Author.email -}}
-    <managingEditor>{{ . }}{{ with site.Author.name }} ({{ . }}){{end}}</managingEditor>
+    <managingEditor>{{ . }}{{ with site.Author.name }} ({{ . }}){{ end }}</managingEditor>
     {{ end -}}
     {{ with site.Author.email -}}
-    <webMaster>{{ . }}{{ with site.Author.name }} ({{ . }}){{end}}</webMaster>
+    <webMaster>{{ . }}{{ with site.Author.name }} ({{ . }}){{ end }}</webMaster>
     {{ end -}}
     {{ with site.Copyright -}}
     <copyright>{{ . }}</copyright>
@@ -36,7 +36,7 @@
       <link>{{ .Permalink }}</link>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       {{ with site.Author.email -}}
-      <author>{{ . }}{{ with site.Author.name }} ({{ . }}){{end}}</author>
+      <author>{{ . }}{{ with site.Author.name }} ({{ . }}){{ end }}</author>
       {{ end -}}
       <guid>{{ .Permalink }}</guid>
       <description>{{ .Content | html }}</description>
diff --git a/layouts/micro/list.html b/layouts/micro/list.html
index e0b57de..a4a5814 100644
--- a/layouts/micro/list.html
+++ b/layouts/micro/list.html
@@ -3,15 +3,15 @@
 <h1 class="title">Micro posts</h1>
 <p class="micro__follow"><a href="https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}">{{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }}</a></p>
 
-{{ with .Content }}
+{{ with .Content -}}
 <div class="content">
 {{ . }}
 </div>
-{{ end }}
+{{ end -}}
 
 {{ $paginator := .Paginate (.Pages) -}}
 {{ range $paginator.Pages -}}
-{{ .Render "summary"}}
+{{ .Render "summary" }}
 {{ end -}}
 
 {{ partial "pagination.html" . }}
diff --git a/layouts/micro/list.json.json b/layouts/micro/list.json.json
index 778a5d3..a0aa79e 100644
--- a/layouts/micro/list.json.json
+++ b/layouts/micro/list.json.json
@@ -3,7 +3,7 @@
 {
     "version" : "https://jsonfeed.org/version/1",
     "title" : "Micro posts {{ i18n "string_on" }} {{ site.Title }}",
-    "description": "Micro blog {{ i18n "string_by" }} {{ with site.Author.name }}{{ . }}{{end}}, {{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }} {{ i18n "string_at" }} https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}",
+    "description": "Micro blog {{ i18n "string_by" }} {{ with site.Author.name }}{{ . }}{{ end }}, {{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }} {{ i18n "string_at" }} https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}",
     "home_page_url" : "{{ site.BaseURL }}",
     {{ with .OutputFormats.Get "JSON" -}}
     "feed_url" : "{{ .Permalink }}",
diff --git a/layouts/micro/rss.xml b/layouts/micro/rss.xml
index 2c91536..9d3904b 100644
--- a/layouts/micro/rss.xml
+++ b/layouts/micro/rss.xml
@@ -2,16 +2,16 @@
   <channel>
     <title>Micro posts {{ i18n "string_on" }} {{ site.Title }}</title>
     <link>{{ .Permalink }}</link>
-    <description>Micro blog {{ i18n "string_by" }} {{ with site.Author.name }}{{ . }}{{end}}, {{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }} {{ i18n "string_at" }} https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}</description>
+    <description>Micro blog {{ i18n "string_by" }} {{ with site.Author.name }}{{ . }}{{ end }}, {{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }} {{ i18n "string_at" }} https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}</description>
     <generator>Hugo -- gohugo.io</generator>
     {{ with site.LanguageCode -}}
     <language>{{ . }}</language>
     {{ end -}}
     {{ with site.Author.email -}}
-    <managingEditor>{{ . }}{{ with site.Author.name }} ({{ . }}){{end}}</managingEditor>
+    <managingEditor>{{ . }}{{ with site.Author.name }} ({{ . }}){{ end }}</managingEditor>
     {{ end -}}
     {{ with site.Author.email -}}
-    <webMaster>{{ . }}{{ with site.Author.name }} ({{ . }}){{end}}</webMaster>
+    <webMaster>{{ . }}{{ with site.Author.name }} ({{ . }}){{ end }}</webMaster>
     {{ end -}}
     {{ with site.Copyright -}}
     <copyright>{{ . }}</copyright>
diff --git a/layouts/podcast/rss.xml b/layouts/podcast/rss.xml
index b81c6bf..a969907 100644
--- a/layouts/podcast/rss.xml
+++ b/layouts/podcast/rss.xml
@@ -7,10 +7,10 @@
     <generator>Hugo -- gohugo.io</generator>
     <language>{{ site.Params.Podcast.Lang | default site.LanguageCode }}</language>
     {{ with site.Author.email -}}
-    <managingEditor>{{ . }}{{ with site.Author.name }} ({{ . }}){{end}}</managingEditor>
+    <managingEditor>{{ . }}{{ with site.Author.name }} ({{ . }}){{ end }}</managingEditor>
     {{ end -}}
     {{ with site.Author.email -}}
-    <webMaster>{{ . }}{{ with site.Author.name }} ({{ . }}){{end}}</webMaster>
+    <webMaster>{{ . }}{{ with site.Author.name }} ({{ . }}){{ end }}</webMaster>
     {{ end -}}
     {{ with site.Copyright -}}
     <copyright>{{ . }}</copyright>
@@ -20,7 +20,7 @@
     {{ end -}}
     {{ with site.Params.Podcast.Image }}{{ $image := resources.Get . }}<itunes:image href="{{ $image.Permalink }}" />{{ end }}
     {{ with site.Params.Podcast.Category -}}
-    <itunes:category {{ if .name }}text="{{ .name }}"{{end}}>
+    <itunes:category {{ if .name }}text="{{ .name }}"{{ end }}>
       {{ range .subcategories }}<itunes:category text="{{ . }}" />{{ end }}
     </itunes:category>
     {{ end -}}
@@ -37,7 +37,7 @@
     {{ with site.Params.Podcast.Complete }}<itunes:complete>{{ . }}</itunes:complete>{{ end }}
     {{ with site.Params.Podcast.NewFeed }}<itunes:new-feed-url>{{ . }}</itunes:new-feed-url>{{ end }}
     <itunes:explicit>{{ if site.Params.Podcast.Explicit }}true{{ else }}false{{ end }}</itunes:explicit>
-    {{ range .Pages }}
+    {{ range .Pages -}}
     <item>
       <title>{{ .Title }}</title>
       <itunes:title>{{ .Title }}</itunes:title>
@@ -61,6 +61,6 @@
       {{ with .Params.podcast.block }}<itunes:block>{{ . }}</itunes:block>{{ end }}
       <itunes:explicit>{{ if .Params.podcast.explicit }}true{{ else }}false{{ end }}</itunes:explicit>
     </item>
-    {{ end }}
+    {{ end -}}
   </channel>
 </rss>