diff --git a/assets/scripts/App.js b/assets/scripts/App.js
index 65c1a82..6b743d4 100644
--- a/assets/scripts/App.js
+++ b/assets/scripts/App.js
@@ -31,7 +31,7 @@ class App {
      */
     deleteModules() {
         // Loop modules
-        var i = this.currentModules.length;
+        let i = this.currentModules.length;
 
         // Destroy all modules
         while (i--) {
@@ -93,7 +93,7 @@ class App {
             let attr = options.module;
 
             // Splitting modules found in the data-attribute
-            let moduleIdents = attr.replace(/\s/g, '').split(',');
+            let moduleIdents = attr.split(/,\s*|\s+/g);
 
             // Loop modules
             let j = 0;
diff --git a/assets/scripts/transitions/TransitionManager.js b/assets/scripts/transitions/TransitionManager.js
index dd6bcac..5b6b808 100644
--- a/assets/scripts/transitions/TransitionManager.js
+++ b/assets/scripts/transitions/TransitionManager.js
@@ -44,10 +44,8 @@ export default class {
         });
 
         Barba.Dispatcher.on('newPageReady', (currentStatus, prevStatus, container, currentHTML) => {
-            var scripts, s;
-
             // Fetch any inline script elements.
-            scripts = container.querySelectorAll('script.js-inline');
+            const scripts = container.querySelectorAll('script.js-inline');
 
             if (scripts instanceof window.NodeList) {
                 let i = 0;
diff --git a/assets/scripts/utils/array.js b/assets/scripts/utils/array.js
index f197a22..e6d6bd7 100644
--- a/assets/scripts/utils/array.js
+++ b/assets/scripts/utils/array.js
@@ -1,7 +1,7 @@
 import { isArray } from './is';
 
 export function addToArray ( array, value ) {
-    var index = array.indexOf( value );
+    const index = array.indexOf( value );
 
     if ( index === -1 ) {
         array.push( value );
@@ -19,7 +19,7 @@ export function arrayContains ( array, value ) {
 }
 
 export function arrayContentsMatch ( a, b ) {
-    var i;
+    let i;
 
     if ( !isArray( a ) || !isArray( b ) ) {
         return false;
@@ -68,7 +68,8 @@ export function removeFromArray ( array, member ) {
 }
 
 export function toArray ( arrayLike ) {
-    var array = [], i = arrayLike.length;
+    const array = [];
+    let i = arrayLike.length;
     while ( i-- ) {
         array[i] = arrayLike[i];
     }
diff --git a/assets/scripts/utils/html.js b/assets/scripts/utils/html.js
index 98f1ab5..870066d 100644
--- a/assets/scripts/utils/html.js
+++ b/assets/scripts/utils/html.js
@@ -27,13 +27,13 @@ export function unescapeHtml(str) {
  */
 export function getNodeData(node) {
     // All attributes
-    var attributes = node.attributes;
+    const attributes = node.attributes;
 
     // Regex Pattern
-    var pattern = /^data\-(.+)$/;
+    const pattern = /^data\-(.+)$/;
 
     // Output
-    var data = {};
+    const data = {};
 
     for (let i in attributes) {
         if (!attributes[i]) {
@@ -61,7 +61,7 @@ export function getNodeData(node) {
     return data;
 }
 
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/;
+const rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/;
 
 /**
  * Parse value to data type.
diff --git a/assets/scripts/utils/is.js b/assets/scripts/utils/is.js
index b5d865a..0892fbe 100644
--- a/assets/scripts/utils/is.js
+++ b/assets/scripts/utils/is.js
@@ -32,6 +32,6 @@ export function isObject ( thing ) {
 }
 
 export function isFunction( thing ) {
-    var getType = {};
+    const getType = {};
     return thing && getType.toString.call(thing) === '[object Function]';
 }