diff --git a/_layouts/cask_json.json b/_layouts/cask_json.json
index 920262e168b5..85de131767a0 100644
--- a/_layouts/cask_json.json
+++ b/_layouts/cask_json.json
@@ -2,45 +2,29 @@
 ---
 {%- assign token = page.name | remove: ".json" -%}
 {%- assign cask = site.data.cask[token] -%}
+{%- assign intervals = "30d, 90d, 365d" | split: ", " -%}
 {
 
 {%- for key_value in cask -%}
   {{ key_value[0] | jsonify }}:{{ key_value[1] | jsonify }},
 {%- endfor -%}
 
-"analytics":{"install":{"30d":{
-{%- if site.data.analytics.cask-install["homebrew-cask"]["30d"].formulae[token].size > 0 -%}
-  {%- for fa in site.data.analytics.cask-install["homebrew-cask"]["30d"].formulae[token] -%}
-    {{ fa.cask | jsonify }}:{{ fa.count | remove: "," | plus: 0 }}
-    {%- unless forloop.last -%}
-    ,
-    {%- endunless -%}
-  {%- endfor -%}
-{%- else -%}
-  {{ token | jsonify }}:0
-{%- endif -%}
-},"90d":{
-
-{%- if site.data.analytics.cask-install["homebrew-cask"]["90d"].formulae[token].size > 0 -%}
-  {%- for fa in site.data.analytics.cask-install["homebrew-cask"]["90d"].formulae[token] -%}
-    {{ fa.cask | jsonify }}:{{ fa.count | remove: "," | plus: 0 }}
-    {%- unless forloop.last -%}
-    ,
-    {%- endunless -%}
-  {%- endfor -%}
-{%- else -%}
-  {{ token | jsonify }}:0
-{%- endif -%}
-},"365d":{
-
-{%- if site.data.analytics.cask-install["homebrew-cask"]["365d"].formulae[token].size > 0 -%}
-  {%- for fa in site.data.analytics.cask-install["homebrew-cask"]["365d"].formulae[token] -%}
-    {{ fa.cask | jsonify }}:{{ fa.count | remove: "," | plus: 0 }}
-    {%- unless forloop.last -%}
-    ,
-    {%- endunless -%}
-  {%- endfor -%}
-{%- else -%}
-  {{ token | jsonify }}:0
-{%- endif -%}
-}}},"generated_date":"{{ "today" | date: "%F" }}"}
+"analytics":{"install":{
+{%- for interval in intervals -%}
+  "{{ interval }}":{
+  {%- if site.data.analytics.cask-install.homebrew-cask[interval].formulae[token].size > 0 -%}
+    {%- for fa in site.data.analytics.cask-install.homebrew-cask[interval].formulae[token] -%}
+      {{ fa.cask | jsonify }}:{{ fa.count | remove: "," | plus: 0 }}
+      {%- unless forloop.last -%}
+      ,
+      {%- endunless -%}
+    {%- endfor -%}
+  {%- else -%}
+    {{ token | jsonify }}:0
+  {%- endif -%}
+  }
+  {%- unless forloop.last -%}
+  ,
+  {%- endunless -%}
+{%- endfor -%}
+}},"generated_date":"{{ "today" | date: "%F" }}"}