diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 3088b2a..ebd7e42 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -19,9 +19,9 @@
 <div class="region header__region">{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end }}</div>
 </header>
 
-{{ partial "menu.html" . -}}
+{{ partial "menu.html" . }}
 
-{{ block "main" . }}{{ end -}}
+{{ block "main" . }}{{ end }}
 
 {{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . -}}{{ end }}
 
diff --git a/layouts/_default/full.html b/layouts/_default/full.html
index 9ed7e7c..c302f1c 100644
--- a/layouts/_default/full.html
+++ b/layouts/_default/full.html
@@ -1,7 +1,7 @@
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}full-view">
 <header>
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h1>
-{{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . -}}{{ end }}
+{{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . }}{{ end -}}
 </header>
 <div class="content">
 {{ .Content }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 3e38b5b..589316a 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="content layout__content" role="main">
+<main class="main layout__main" role="main">
 <h1 class="title">{{ .Title }}</h1>
 {{ $paginator := .Paginate (.Data.Pages) -}}
 {{ range $paginator.Pages -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 306a851..749f6c4 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -3,17 +3,17 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="content layout__content" role="main">
+<main class="main layout__main" role="main">
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}">{{ .Title }}</h1>
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
 <header>
-{{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . -}}{{ end }}
-{{ if .Params.tags }}{{ partial "tags.html" . -}}{{ end }}
+{{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . }}{{ end -}}
+{{ if .Params.tags }}{{ partial "tags.html" . }}{{ end -}}
 </header>
 <div class="content">
 {{ .Content }}
 
-{{- if not .Lastmod.IsZero }}{{ partial "dates.html" . -}}{{ end -}}
+{{ if not .Lastmod.IsZero }}{{ partial "dates.html" . }}{{ end -}}
 </div>
 </article>
 </main>
diff --git a/layouts/index.html b/layouts/index.html
index bb1c7b9..516af84 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -6,7 +6,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="content layout__content" role="main">
+<main class="main layout__main" role="main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
 <div class="content">
 {{ .Content }}
diff --git a/layouts/partials/submitted.html b/layouts/partials/submitted.html
index fb73755..bdeeba8 100644
--- a/layouts/partials/submitted.html
+++ b/layouts/partials/submitted.html
@@ -1,8 +1,8 @@
 <p class="submitted">
 {{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
-{{ if not .Lastmod.IsZero }}
+{{ if not .Lastmod.IsZero -}}
 <time class="modified-date" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.Format ($.Param "dateformat" | default "2 January, 2006") }}</time>
-{{ else }}
+{{ else -}}
 <time class="modified-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format ($.Param "dateformat" | default "2 January, 2006") }}</time>
 {{ end -}}
 </p>
diff --git a/sass/components/wireframe/_wireframe.scss b/sass/components/wireframe/_wireframe.scss
index 665c567..89653ff 100644
--- a/sass/components/wireframe/_wireframe.scss
+++ b/sass/components/wireframe/_wireframe.scss
@@ -26,7 +26,7 @@ $with-wireframes: false !default;
   .layout {
     &__header,
     &__footer,
-    &__content,
+    &__main,
     &__navigation,
     &__first-sidebar,
     &__second-sidebar,
diff --git a/sass/layouts/_layouts.scss b/sass/layouts/_layouts.scss
index 5186e0e..5d14d00 100644
--- a/sass/layouts/_layouts.scss
+++ b/sass/layouts/_layouts.scss
@@ -10,7 +10,7 @@
 
   &__header,
   &__footer,
-  &__content,
+  &__main,
   &__navigation,
   &__first-sidebar,
   &__second-sidebar,
@@ -112,7 +112,7 @@
       grid-area: top;
     }
 
-    &__content {
+    &__main {
       grid-area: main;
     }