diff --git a/layouts/_default/index.html b/layouts/_default/index.html
index fade676..74acf48 100644
--- a/layouts/_default/index.html
+++ b/layouts/_default/index.html
@@ -21,13 +21,13 @@
         </h1>
 
         <div class="post-meta">
-          {{ with .Date }}
+          {{ if .Date }}
             <time class="post-date">
-              {{ .Format "2006-01-02" }}
+              {{ .Date.Format "2006-01-02" }} ::
             </time>
           {{ end }}
           {{ with .Params.Author }}
-            <span class="post-author">:: {{ . }}</span>
+            <span class="post-author">{{ . }}</span>
           {{ end }}
         </div>
 
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 8d4fb47..0fafd36 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -11,9 +11,9 @@
           <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
         </h1>
         <div class="post-meta">
-          {{ with .Date }}
+          {{ if .Date }}
             <time class="post-date">
-              {{ .Format "2006-01-02" }} ::
+              {{ .Date.Format "2006-01-02" }} ::
             </time>
           {{ end }}
           {{ with .Params.Author }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5137a02..1bc4328 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,9 +4,9 @@
     <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
   </h1>
   <div class="post-meta">
-    {{ with .Date }}
+    {{ if .Date }}
       <time class="post-date">
-        {{ .Format "2006-01-02" }} ::
+        {{ .Date.Format "2006-01-02" }} ::
         {{ if $.Site.Params.showLastUpdated }}
           [{{or $.Site.Params.updatedDatePrefix "Updated"}} :: {{ .Lastmod.Format "2006-01-02" }}]
         {{ end }}