diff --git a/exampleSite/layouts/partials/shortcodes/piratify.html b/exampleSite/layouts/partials/shortcodes/piratify.html
index 266946bc1f..172bec7bc1 100644
--- a/exampleSite/layouts/partials/shortcodes/piratify.html
+++ b/exampleSite/layouts/partials/shortcodes/piratify.html
@@ -149,4 +149,4 @@
 		{{- end }}
 	{{- end }}
 {{- end }}
-{{ $c | safeHTML }}
\ No newline at end of file
+{{- $c | safeHTML }} 
\ No newline at end of file
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index fb78f45a45..dcf3bfba98 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -19,7 +19,7 @@
 <h2 id="{{ $capital | plainify | anchorize }}">{{ $capital }}</h2>
 <ul class="columnize">
   {{- end }}
-  {{- $c:=""}}{{/* display terms of a taxonomy */}}
+  {{- /* display terms of a taxonomy */}}
   <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .Page) }}">{{ .Title }}</a> ({{ .Count }})</li>
   {{- $lastCapital = $capital }}
 {{- end }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index e7186da6b9..46fc5c79eb 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -19,7 +19,7 @@
 <h2 id="{{ $capital | plainify | anchorize }}">{{ $capital }}</h2>
 <ul class="columnize">
   {{- end }}
-  {{- $c:=""}}{{/* display pages of a term */}}
+  {{- /* display pages of a term */}}
   {{- $breadcrumb := "" }}
   {{- if (ne .Page.Site.Params.disableTermBreadcrumbs true) }}
     {{- $breadcrumb = (trim ((partial "breadcrumbs.html" (dict "page" .Page "dirOnly" true)) | plainify | htmlUnescape) "\n\r\t ") }}
diff --git a/layouts/alias.html b/layouts/alias.html
index 8aac34ecfa..336578b1d9 100644
--- a/layouts/alias.html
+++ b/layouts/alias.html
@@ -8,15 +8,15 @@
     {{- end }}
     {{- $url = replace $url "//" "/" }}
     {{- with site.Home.GetPage $url }}
-      {{- $c := "" }}{{/* if defaultContentLanguageInSubdir=false we are ending here for home page of the default language */}}
+      {{- /* if defaultContentLanguageInSubdir=false we are ending here for home page of the default language */}}
       {{- $url = partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}
     {{- else }}
       {{- $url_alt := replaceRE "^/[^/]*(/.*)" "${1}" $url }}
       {{- with site.Home.GetPage $url_alt }}
-        {{- $c := "" }}{{/* if defaultContentLanguageInSubdir=true we are ending here for home page */}}
+        {{- /* if defaultContentLanguageInSubdir=true we are ending here for home page */}}
         {{- $url = partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}
       {{- else }}
-        {{- $c := "" }}{{/* for regular aliases we are ending here with no original page found */}}
+        {{- /* for regular aliases we are ending here with no original page found */}}
         {{- $url = partial "relLangPrettyUglyURL.hugo" (dict "link" $url) }}
       {{- end }}
     {{- end }}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index acd3055a64..5cf42c66bc 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,6 +1,6 @@
 
     <meta charset="utf-8">
-    {{- $c:=""}}{{/* to avoid that user swiping to the left leaves a gap on the right side, we set minimum-scale, even if not advised to */}}
+    {{- /* to avoid that user swiping to the left leaves a gap on the right side, we set minimum-scale, even if not advised to */}}
     <meta name="viewport" content="height=device-height, width=device-width, initial-scale=1.0, minimum-scale=1.0">
     {{- if (ne .Site.Params.disableGeneratorVersion true) }}
         {{- $gen := hugo.Generator }}
diff --git a/layouts/partials/nested-content.hugo b/layouts/partials/nested-content.hugo
index 5144ed39e4..185088944d 100644
--- a/layouts/partials/nested-content.hugo
+++ b/layouts/partials/nested-content.hugo
@@ -3,7 +3,7 @@
 {{- $content := "" }}
 {{- $url := partial "relLangPrettyUglyURL.hugo" (dict "to" $page) }}
 {{- if $url }}
-	{{- $c:=""}}{{/* if we have a relative link in a print page, our print URL is one level to deep; so we are making it absolute to our page by prepending the page's permalink */}}
+	{{- /* if we have a relative link in a print page, our print URL is one level to deep; so we are making it absolute to our page by prepending the page's permalink */}}
 	{{- $link_prefix := strings.TrimRight "/" $page.RelPermalink }}
 	{{- $content = partial "output-partial.hugo" (dict "base" "content" "page" $page "parameter" $page "outputFormat" $outputFormat) }}
 	{{- $content = replaceRE "((?:src|href)\\s*=(?:\\s*[\"']\\s*)?)(\\.[^\"'\\s>]*|[\\w]+[^\"'\\s>:]*)([\"'\\s>])" (printf "${1}%s/${2}${3}" $link_prefix) $content }}
diff --git a/layouts/partials/pageHelper/taxonomyPages.html b/layouts/partials/pageHelper/taxonomyPages.html
index fb9ffe6be8..cab1bd1c0d 100644
--- a/layouts/partials/pageHelper/taxonomyPages.html
+++ b/layouts/partials/pageHelper/taxonomyPages.html
@@ -2,7 +2,7 @@
 {{- range .Data.Terms }}
   {{- $count := 0 }}
   {{- range .Pages }}
-    {{- $c:=""}}{{/* count pages of term */}}
+    {{- /* count pages of term */}}
     {{- if and .Title .RelPermalink (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
       {{- $count = add $count 1 }}
     {{- end }}
diff --git a/layouts/partials/shortcodes/attachments.html b/layouts/partials/shortcodes/attachments.html
index df1af286f4..988909bf96 100644
--- a/layouts/partials/shortcodes/attachments.html
+++ b/layouts/partials/shortcodes/attachments.html
@@ -52,7 +52,7 @@
   {{- $fileLink = strings.TrimPrefix "content/" $fileLink }}
   {{- $filesName := printf "%s.files" .File.BaseFileName }}
   {{- if and (eq .File.BaseFileName "index") (fileExists (printf "%sfiles" $fileDir)) }}
-    {{- $c := "" }}{{/* backward compat to < 5.9.0 behavior */}}
+    {{- /* backward compat to < 5.9.0 behavior */}}
     {{- $filesName = "files" }}
   {{- end }}
   {{- $dir := printf "%s%s" $fileDir $filesName }}
@@ -71,7 +71,7 @@
         {{- end }}
         {{- $unitsymbol := $unit | T }}
         {{- $link := (printf "%s%s/%s" $fileLink $filesName .Name) | relLangURL }}
-        {{- $c := "" }}{{/* Hugo stores the attachments always in the default language subdirectory */}}
+        {{- /* Hugo stores the attachments always in the default language subdirectory */}}
         {{- $link = replace $link $urlPrefix $defaultUrlPrefix 1 }}
       <li><a href="{{ $link }}">{{.Name}}</a> ({{$size}} {{$unitsymbol}})</li>
       {{- end }}
diff --git a/layouts/partials/stylesheet.html b/layouts/partials/stylesheet.html
index 7d9c988dea..b7c344a791 100644
--- a/layouts/partials/stylesheet.html
+++ b/layouts/partials/stylesheet.html
@@ -6,7 +6,7 @@
   {{- end }}
   {{- with $page }}
     {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
-    {{ "<!-- https://github.com/filamentgroup/loadCSS/blob/master/README.md#how-to-use -->" | safeHTML }}
+    {{- /* https://github.com/filamentgroup/loadCSS/blob/master/README.md#how-to-use */}}
     <link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print" onload="this.media='all';this.onload=null;"><noscript><link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"></noscript>
     <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/auto-complete.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print" onload="this.media='all';this.onload=null;"><noscript><link href="{{"css/auto-complete.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"></noscript>
diff --git a/layouts/shortcodes/tab.html b/layouts/shortcodes/tab.html
index 1f8dcc0690..bb5de89261 100644
--- a/layouts/shortcodes/tab.html
+++ b/layouts/shortcodes/tab.html
@@ -20,7 +20,7 @@
 {{- if .Parent }}
     {{- $.Parent.Scratch.Set "tabs" $tabs }}
 {{- else }}
-    {{- $c:=""}}{{/* if no containing tabs shortcode is present, we display this tab as single */}}
+    {{- /* if no containing tabs shortcode is present, we display this tab as single */}}
     {{- partial "shortcodes/tabs.html" (dict
         "page"    .Page
         "color"   ""