diff --git a/Auth/Auth.js b/Auth/Auth.js
index dedd4ed..8382869 100644
--- a/Auth/Auth.js
+++ b/Auth/Auth.js
@@ -60,7 +60,7 @@
      */
     jsOMS.Auth.Auth.prototype.login = function ()
     {
-        var authRequest = new jsOMS.Message.Request.Request();
+        const authRequest = new jsOMS.Message.Request.Request();
         authRequest.setUri(this.uri);
         authRequest.setMethod(jsOMS.Message.Request.RequestMethod.POST);
         authRequest.setResponseType(jsOMS.Message.Request.RequestType.JSON);
diff --git a/UI/Component/Form.js b/UI/Component/Form.js
index dd3ef85..74b807a 100644
--- a/UI/Component/Form.js
+++ b/UI/Component/Form.js
@@ -76,7 +76,7 @@
             const forms  = document.getElementsByTagName('form'),
                 length = !forms ? 0 : forms.length;
 
-            for (var i = 0; i < length; i++) {
+            for (let i = 0; i < length; i++) {
                 if (typeof forms[i].getAttribute('id') !== 'undefined' && forms[i].getAttribute('id') !== null && typeof this.ignore[forms[i].getAttribute('id')] === 'undefined') {
                     this.bindForm(forms[i].getAttribute('id'));
                 }
diff --git a/UI/Component/Tab.js b/UI/Component/Tab.js
index 5df85d0..30379d1 100644
--- a/UI/Component/Tab.js
+++ b/UI/Component/Tab.js
@@ -40,10 +40,10 @@
                 this.bindElement();
             }
         } else {
-            var tabs = document.querySelectorAll('.tabview'),
+            const tabs = document.querySelectorAll('.tabview'),
                 length = !tabs ? 0 : tabs.length;
 
-            for (var i = 0; i < length; i++) {
+            for (let i = 0; i < length; i++) {
                 this.bindElement(tabs[i]);
             }
         }
diff --git a/UI/Component/Table.js b/UI/Component/Table.js
index f1269b8..db07aa4 100644
--- a/UI/Component/Table.js
+++ b/UI/Component/Table.js
@@ -43,7 +43,7 @@
             const tables = document.getElementsByTagName('table'),
                 length = !tables ? 0 : tables.length;
 
-            for (var i = 0; i < length; i++) {
+            for (let i = 0; i < length; i++) {
                 this.bindElement(tables[i]);
             }
         }
diff --git a/UI/DragNDrop.js b/UI/DragNDrop.js
index 7f3f165..cb5997e 100644
--- a/UI/DragNDrop.js
+++ b/UI/DragNDrop.js
@@ -51,7 +51,7 @@
             const elements = document.querySelectorAll('[draggable]'),
                 length = !elements ? 0 : elements.length;
 
-            for (var i = 0; i < length; i++) {
+            for (let i = 0; i < length; i++) {
                 if (typeof elements[i].getAttribute('id') !== 'undefined' && elements[i].getAttribute('id') !== null) {
                     this.bindElement(elements[i].getAttribute('id'));
                 }
diff --git a/Utils/StringUtils.js b/Utils/StringUtils.js
index caacf00..a38c3ea 100644
--- a/Utils/StringUtils.js
+++ b/Utils/StringUtils.js
@@ -120,10 +120,10 @@
      */
     jsOMS.hash = function (str)
     {
-        var res = 0,
-            len = str.length;
+        let res = 0
+        const len = str.length;
 
-        for (var i = 0; i < len; i++) {
+        for (let i = 0; i < len; i++) {
             res = res * 31 + str.charCodeAt(i);
         }
 
diff --git a/Utils/UiUtils.js b/Utils/UiUtils.js
index bb00b04..94a12c5 100644
--- a/Utils/UiUtils.js
+++ b/Utils/UiUtils.js
@@ -65,7 +65,7 @@
     jsOMS.removeClass = function (ele, cls)
     {
         if (jsOMS.hasClass(ele, cls)) {
-            var reg       = new RegExp('(\\s|^)' + cls + '(\\s|$)');
+            const reg       = new RegExp('(\\s|^)' + cls + '(\\s|$)');
             ele.className = ele.className.replace(reg, '');
         }
     };
@@ -193,9 +193,9 @@
      */
     jsOMS.getByClass = function (ele, cls)
     {
-        var length = ele.childNodes.length;
+        const length = ele.childNodes.length;
 
-        for (var i = 0; i < length; i++) {
+        for (let i = 0; i < length; i++) {
             if (jsOMS.hasClass(ele.childNodes[i], cls)) {
                 return ele.childNodes[i];
             }
diff --git a/Utils/oLib.js b/Utils/oLib.js
index d549d27..7682776 100644
--- a/Utils/oLib.js
+++ b/Utils/oLib.js
@@ -193,7 +193,7 @@
     jsOMS.removeClass = function (ele, cls)
     {
         if (jsOMS.hasClass(ele, cls)) {
-            var reg       = new RegExp('(\\s|^)' + cls + '(\\s|$)');
+            const reg       = new RegExp('(\\s|^)' + cls + '(\\s|$)');
             ele.className = ele.className.replace(reg, '');
         }
     };
@@ -294,10 +294,10 @@
      */
     jsOMS.hash = function (str)
     {
-        var res = 0,
-            len = str.length;
+        let res = 0,
+        const len = str.length;
 
-        for (var i = 0; i < len; i++) {
+        for (let i = 0; i < len; i++) {
             res = res * 31 + str.charCodeAt(i);
         }
 
@@ -363,9 +363,9 @@
      */
     jsOMS.getByClass = function (ele, cls)
     {
-        var length = ele.childNodes.length;
+        const length = ele.childNodes.length;
 
-        for (var i = 0; i < length; i++) {
+        for (let i = 0; i < length; i++) {
             if (jsOMS.hasClass(ele.childNodes[i], cls)) {
                 return ele.childNodes[i];
             }