diff --git a/depictions/web/changelog.html b/depictions/web/changelog.html
index 54dfdfdf..9b3df9a4 100644
--- a/depictions/web/changelog.html
+++ b/depictions/web/changelog.html
@@ -33,13 +33,12 @@
       src="js/content-blocks-changelog.js"
     ></script>
     <script type="text/javascript">
-      bundleid = $.QueryString["p"];
+      const bundleid = $.QueryString.p;
+      const contentBlocks = getContentBlocks();
 
-      var contentBlocks = getContentBlocks();
-
-      $(document).ready(function () {
+      $(document).ready(() => {
         populateContentBlocks(
-          bundleid + "/changelog.xml",
+          `${bundleid}/changelog.xml`,
           contentBlocks,
           () => {
             $("#packageError").show();
@@ -68,16 +67,16 @@
     </div>
     <!-- REPO FOOTER -->
     <script type="text/javascript">
-      var repoContents = {
+      const repoContents = {
         "#repoFooterLinks": {
           type: "custom",
           source: "repo>footerlinks>link",
-          render: function (element, source) {
-            $.each(source, function (index, data) {
-              var a = $("<a class='link-item list-group-item'>");
+          render: (element, source) => {
+            $.each(source, (index, data) => {
+              const a = $("<a class='link-item list-group-item'>");
               a.attr("href", $(data).find("url").text());
               if ($(data).find("iconclass")) {
-                var i = $("<span>");
+                const i = $("<span>");
                 i.attr("class", $(data).find("iconclass").text());
                 console.log(i);
                 $(a).append(i);
@@ -88,15 +87,15 @@
           }, //render
         },
       };
-      $(document).ready(function () {
+      $(document).ready(() => {
         $.ajax({
           type: "GET",
           dataType: "xml",
           url: "../../repo.xml",
           cache: false,
-          success: function (xml) {
+          success: (xml) => {
             data_loader_engine(repoContents, xml);
-            if (navigator.userAgent.search(/Cydia/) != -1) {
+            if (navigator.userAgent.search(/Cydia/) !== -1) {
               $("a").each(function () {
                 console.log($(this).text());
                 $(this).attr("target", "_blank");
@@ -104,7 +103,7 @@
             }
           },
 
-          error: function () {
+          error: () => {
             $("#contactInfo").hide();
           },
         }); //ajax
diff --git a/depictions/web/index.html b/depictions/web/index.html
index af07b8b7..d0bf0372 100644
--- a/depictions/web/index.html
+++ b/depictions/web/index.html
@@ -120,7 +120,7 @@
     </style>
     <script>
       $(() => {
-        const bundleid = $.QueryString["p"];
+        const bundleid = $.QueryString.p;
         const contentBlocks = getContentBlocks();
 
         populateContentBlocks(
diff --git a/depictions/web/js/content-blocks-index.js b/depictions/web/js/content-blocks-index.js
index 1d5b1d46..860b6df6 100644
--- a/depictions/web/js/content-blocks-index.js
+++ b/depictions/web/js/content-blocks-index.js
@@ -1,8 +1,6 @@
-function setBundleId(id) {
-  bundleid = id;
-}
-
 function getContentBlocks() {
+  const bundleid = $.QueryString.p;
+
   return {
     "#packageName": {
       type: "text",
diff --git a/depictions/web/js/content-blocks-screenshots.js b/depictions/web/js/content-blocks-screenshots.js
index d55927bd..374ccdad 100644
--- a/depictions/web/js/content-blocks-screenshots.js
+++ b/depictions/web/js/content-blocks-screenshots.js
@@ -1,8 +1,6 @@
-function setBundleId(id) {
-  bundleid = id;
-}
-
 function getContentBlocks() {
+  const bundleid = $.QueryString.p;
+
   return {
     "#screenshotsList": {
       type: "custom",
@@ -16,6 +14,7 @@ function getContentBlocks() {
           );
           return;
         }
+
         $.each(source, (index, data) => {
           const th = $("<div class='thumbnail'>");
           th.append($("<p>").text($(data).find("description").text()));
diff --git a/depictions/web/screenshots.html b/depictions/web/screenshots.html
index 7009872e..88d9c820 100644
--- a/depictions/web/screenshots.html
+++ b/depictions/web/screenshots.html
@@ -33,14 +33,13 @@
       src="js/content-blocks-screenshots.js"
     ></script>
     <script type="text/javascript">
-      bundleid = $.QueryString["p"];
+      const bundleid = $.QueryString.p;
+      const contentBlocks = getContentBlocks();
 
-      var contentBlocks = getContentBlocks();
-
-      $(document).ready(function () {
+      $(document).ready(() => {
         //return;
         populateContentBlocks(
-          bundleid + "/info.xml",
+          `${bundleid}/info.xml`,
           contentBlocks,
           () => {
             $("#packageError").show();
@@ -72,16 +71,16 @@ <h5>SCREENSHOTS</h5>
     </div>
     <!-- REPO FOOTER -->
     <script type="text/javascript">
-      var repoContents = {
+      const repoContents = {
         "#repoFooterLinks": {
           type: "custom",
           source: "repo>footerlinks>link",
-          render: function (element, source) {
-            $.each(source, function (index, data) {
-              var a = $("<a class='link-item list-group-item'>");
+          render: (element, source) => {
+            $.each(source, (index, data) => {
+              const a = $("<a class='link-item list-group-item'>");
               a.attr("href", $(data).find("url").text());
               if ($(data).find("iconclass")) {
-                var i = $("<span>");
+                const i = $("<span>");
                 i.attr("class", $(data).find("iconclass").text());
                 console.log(i);
                 $(a).append(i);
@@ -92,22 +91,22 @@ <h5>SCREENSHOTS</h5>
           }, //render
         },
       };
-      $(document).ready(function () {
+      $(document).ready(() => {
         $.ajax({
           type: "GET",
           dataType: "xml",
           url: "../../repo.xml",
           cache: false,
-          success: function (xml) {
+          success: (xml) => {
             data_loader_engine(repoContents, xml);
-            if (navigator.userAgent.search(/Cydia/) != -1) {
+            if (navigator.userAgent.search(/Cydia/) !== -1) {
               $("a").each(function () {
                 console.log($(this).text());
                 $(this).attr("target", "_blank");
               });
             }
           },
-          error: function () {
+          error: () => {
             $("#contactInfo").hide();
           },
         }); //ajax