diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html
index 275a9f733b..3149954678 100644
--- a/layouts/_default/_markup/render-codeblock.html
+++ b/layouts/_default/_markup/render-codeblock.html
@@ -1,16 +1,16 @@
 {{ $result := transform.HighlightCodeBlock . }}
 {{- if or .Attributes.placeholders .Attributes.callout -}}
-  {{ $code := highlight .Inner .Type }}
+  {{- $code := highlight .Inner .Type -}}
   {{- if .Attributes.placeholders -}}
-    {{ $placeholderReplace := print "<div data-component='code-placeholder' class='code-placeholder-wrapper'><var title='Edit $0' class='code-placeholder' data-code-var='$0' data-code-var-value='$0' data-code-var-escaped=\"$0\">$0<span class='code-placeholder-edit-icon cf-icon Pencil'></span></var></div>" }}
-    {{ $code = replaceRE .Attributes.placeholders $placeholderReplace $code }}
+    {{- $placeholderReplace := print "<div data-component='code-placeholder' class='code-placeholder-wrapper'><var title='Edit $0' class='code-placeholder' data-code-var='$0' data-code-var-value='$0' data-code-var-escaped=\"$0\">$0<span class='code-placeholder-edit-icon cf-icon Pencil'></span></var></div>" -}}
+    {{- $code = replaceRE .Attributes.placeholders $placeholderReplace $code -}}
   {{- end -}}
   {{- if .Attributes.callout -}}
-    {{ $color := index .Attributes "callout-color" | default "green" }}
-    {{ $calloutReplace := print "<span class='code-callout " $color "'>$0</span>" }}
-    {{ $code = replaceRE .Attributes.callout $calloutReplace $code }}
+    {{- $color := index .Attributes "callout-color" | default "green" -}}
+    {{- $calloutReplace := print "<span class='code-callout " $color "'>$0</span>" -}}
+    {{- $code = replaceRE .Attributes.callout $calloutReplace $code -}}
   {{- end -}}
-  {{ $code | safeHTML }}
+  {{- $code | safeHTML -}}
 {{- else -}}
   {{- $wrapped := string $result.Wrapped -}}
   {{- if in $wrapped "tc-dynamic-values" -}}