diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index d3dae91..fc5e158 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,8 +1,6 @@
 {{ define "main" }}
   <main id="main">
-    <h1>
-      {{ .Title }}
-    </h1>
+    <h1>{{ .Title }}</h1>
     <ul class="patterns-list">
     {{ range .Pages.ByPublishDate.Reverse }}
       <li>
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 8650d4f..a2ace31 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,8 +1,6 @@
 {{ define "main" }}
   <main id="main">
-    <h1>
-      {{ .Title }}
-    </h1>
+    <h1>{{ .Title }}</h1>
     <ul class="patterns-list">
       {{ $type := .Type }}
       {{ range $key, $value := .Data.Terms.ByCount }}
diff --git a/layouts/index.html b/layouts/index.html
index 176d814..ecd5d7d 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-  {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
   <main id="main">
     <h1>{{ .Title }}</h1>
diff --git a/layouts/post/single.html b/layouts/post/single.html
index ab1d8e1..48b2aa5 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -7,7 +7,8 @@
       {{ .Title }}
     </h1>
     <div class="date">
-      <strong aria-hidden="true">Publish date: </strong>{{ .PublishDate.Format $.Site.Params.dateFormat }}
+      {{ $dateFormat := $.Site.Params.dateFormat | default "Jan 2, 2006" }}
+      <strong aria-hidden="true">Publish date: </strong>{{ .PublishDate.Format $dateFormat }}
     </div>
     {{ if isset .Params "tags" }}
       <div class="tags">