diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 6f828b5..28a9de6 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -5,7 +5,7 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
   -->
 
 <!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/hugo-easy-gallery.css" />{{ end }}
+{{- if not ($.Page.Scratch.Get "figurecount") -}}<link rel="stylesheet" href="/css/hugo-easy-gallery.css" />{{- end -}}
 {{- $.Page.Scratch.Add "figurecount" 1 -}}
 
 <!-- if 'resource' is given, look for a page resource by that name. -->
@@ -14,52 +14,51 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
 <!-- (yes, my description is probably at least 50% wrong) -->
 
 <!-- Thumbnail image size/type -->
-{{ $resize_opts := "600x jpg" }}
+{{- $resize_opts := "600x jpg" -}}
 <!-- TODO: This isn't generating a JPEG on my configuration.  Not sure
      why.  Hugo version issue? -->
-
-{{ $thumb := "" }}
-{{ $href := "" }}
-{{ if .Get "resource" }}
-   {{ $page := $.Page }}
-   {{ with .Get "page" }}
-      {{ $page = $.Site.GetPage . }}
-   {{ end }}
+{{- $thumb := "" -}}
+{{- $href := "" -}}
+{{- if .Get "resource" -}}
+   {{- $page := $.Page -}}
+   {{- with .Get "page" -}}
+      {{- $page = $.Site.GetPage . -}}
+   {{- end -}}
    {{- if not $page -}}
       {{- errorf "Error: Can't find page %s" (.Get "page") -}}
    {{- end -}}
-   {{ $resource := (.Get "resource") }}
-   {{ $original := $page.Resources.GetMatch (printf "*%s*" $resource) }}
+   {{- $resource := (.Get "resource") -}}
+   {{- $original := $page.Resources.GetMatch (printf "*%s*" $resource) -}}
    {{- if eq $original nil -}}
       {{- errorf "Error: Can't find resource %s on page %s" $resource (.Get "page") -}}
    {{- end -}}
-   {{ .Scratch.Set "image" ($original.Resize $resize_opts) }}
-   {{ $image := .Scratch.Get "image" }}
-   {{- $thumb = $image.RelPermalink }}
-   {{- $href = $original.RelPermalink }}
-{{ else }}
+   {{- .Scratch.Set "image" ($original.Resize $resize_opts) -}}
+   {{- $image := .Scratch.Get "image" -}}
+   {{- $thumb = $image.RelPermalink -}}
+   {{- $href = $original.RelPermalink -}}
+{{- else -}}
    <!-- use either src or link-thumb for thumbnail image -->
-   {{- $thumb = .Get "src" | default (printf "%s." (.Get "thumb") | replace (.Get "link") ".") }}
-   {{- $href = .Get "link" | default (.Get "src") }}
-{{ end }}
+   {{- $thumb = .Get "src" | default (printf "%s." (.Get "thumb") | replace (.Get "link") ".") -}}
+   {{- $href = .Get "link" | default (.Get "src") -}}
+{{- end -}}
 
 <div class="box{{ with .Get "caption-position" }} fancy-figure caption-position-{{.}}{{end}}{{ with .Get "caption-effect" }} caption-effect-{{.}}{{end}}" {{ with .Get "width" }}style="max-width:{{.}}"{{end}}>
   <figure {{ with .Get "class" }}class="{{.}}"{{ end }} itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
-    <div class="img"{{ if .Parent }} style="background-image: url('{{ $thumb | relURL }}');"{{ end }}{{ with .Get "size" }} data-size="{{.}}"{{ end }}>
-      <img itemprop="thumbnail" src="{{ $thumb | relURL }}" {{ with .Get "alt" | default (.Get "caption" | markdownify) }}alt="{{.}}"{{ end }}/><!-- <img> hidden if in .gallery -->
+    <div class="img"{{ if .Parent }} style="background-image: url('{{ $thumb }}');"{{ end }}{{ with .Get "size" }} data-size="{{.}}"{{ end }}>
+      <img itemprop="thumbnail" src="{{ $thumb }}" {{ with .Get "alt" | default (.Get "caption" | markdownify) }}alt="{{.}}"{{ end }}/><!-- <img> hidden if in .gallery -->
     </div>
     
     <a href="{{ $href }}" itemprop="contentUrl"></a>
-    {{- if or (or (.Get "title") (.Get "caption" | markdownify)) (.Get "attr")}}
+    {{- if or (or (.Get "title") (.Get "caption" | markdownify)) (.Get "attr") -}}
       <figcaption>
-        {{- with .Get "title" }}<h4>{{.}}</h4>{{ end }}
+        {{- with .Get "title" -}}<h4>{{.}}</h4>{{ end }}
         {{- if or (.Get "caption" | markdownify) (.Get "attr")}}
           <p>
             {{- .Get "caption" -}}
             {{- with .Get "attrlink"}}<a href="{{.}}">{{ .Get "attr" }}</a>{{ else }}{{ .Get "attr"}}{{ end -}}
           </p>
-        {{- end }}
+        {{- end -}}
       </figcaption>
-    {{- end }}
+    {{- end -}}
   </figure>
 </div>