diff --git a/Chart/BarChart.js b/Chart/BarChart.js
index 46a260a..dbb5ba5 100644
--- a/Chart/BarChart.js
+++ b/Chart/BarChart.js
@@ -133,7 +133,8 @@
 
     jsOMS.Chart.BarChart.prototype.drawData = function (svg, x, y, dataPointEnter, dataPoint)
     {
-        let self = this, rect;
+        const self = this;
+        let rect;
 
         dataPoint = svg.selectAll(".dataPoint").data(this.chart.dataset, function (c)
         {
diff --git a/Chart/ChartAbstract.js b/Chart/ChartAbstract.js
index 53be9dd..e469ae3 100644
--- a/Chart/ChartAbstract.js
+++ b/Chart/ChartAbstract.js
@@ -245,7 +245,7 @@
 
     jsOMS.Chart.ChartAbstract.prototype.drawLegend = function (svg, dataPointEnter, dataPoint)
     {
-        let self = this;
+        const self = this;
 
         if (typeof this.legend !== 'undefined' && this.legend.visible) {
             dataPointEnter.append("text").attr('class', 'dataPoint-name');
@@ -289,7 +289,8 @@
 
     jsOMS.Chart.ChartAbstract.prototype.drawMarker = function (svg, x, y, dataPointEnter, dataPoint)
     {
-        let self = this, temp;
+        const self = this;
+        let temp;
 
         if (this.dataSettings.marker.visible) {
             temp = dataPointEnter.append('g').attr('class', 'dots').attr('clip-path', 'url(#clipper1)').selectAll('circle').data(function (d)
@@ -539,7 +540,7 @@
     };
 
     jsOMS.Chart.ChartAbstract.prototype.createXAxis = function (x) {
-        let self = this;
+        const self = this;
 
         return d3.svg.axis().scale(x).tickFormat(function (d)
         {
@@ -549,7 +550,7 @@
     };
 
     jsOMS.Chart.ChartAbstract.prototype.createYAxis = function (y) {
-        let self = this;
+        const self = this;
 
         return d3.svg.axis().scale(y).tickFormat(function (d)
         {
diff --git a/Chart/ColumnChart.js b/Chart/ColumnChart.js
index ca0150b..3f4763e 100644
--- a/Chart/ColumnChart.js
+++ b/Chart/ColumnChart.js
@@ -133,7 +133,8 @@
 
     jsOMS.Chart.ColumnChart.prototype.drawData = function (svg, x, y, dataPointEnter, dataPoint)
     {
-        let self = this, rect;
+        const self = this;
+        let rect;
 
         dataPoint = svg.selectAll(".dataPoint").data(this.chart.dataset, function (c)
         {
diff --git a/Chart/LineChart.js b/Chart/LineChart.js
index 3bc4ef1..b703e3c 100644
--- a/Chart/LineChart.js
+++ b/Chart/LineChart.js
@@ -214,7 +214,7 @@
 
     jsOMS.Chart.LineChart.prototype.drawData = function (svg, line, dataPointEnter, dataPoint)
     {
-        let self = this;
+        const self = this;
 
         dataPoint = svg.selectAll(".dataPoint").data(this.chart.dataset, function (c)
         {
diff --git a/Chart/PieChart.js b/Chart/PieChart.js
index 30ebf60..8052936 100644
--- a/Chart/PieChart.js
+++ b/Chart/PieChart.js
@@ -60,8 +60,8 @@
 
     jsOMS.Chart.PieChart.prototype.drawData = function (svg, dataPointEnter, dataPoint)
     {
-        let self = this,
-            pie  = d3.layout.pie()
+        const self = this;
+        let pie  = d3.layout.pie()
                 .sort(null)
                 .value(function (d)
                 {
diff --git a/Chart/PyramidChart.js b/Chart/PyramidChart.js
index 6c04039..f3e59c5 100644
--- a/Chart/PyramidChart.js
+++ b/Chart/PyramidChart.js
@@ -166,7 +166,7 @@
 
     jsOMS.Chart.PyramidChart.prototype.drawData = function (svg, x, y, dataPointEnter, dataPoint)
     {
-        let self = this;
+        const self = this;
 
         dataPoint = svg.selectAll(".dataPoint").data(this.chart.dataset[0].points, function (c)
         {
diff --git a/Chart/ScatterplotChart.js b/Chart/ScatterplotChart.js
index a7550dc..cccceeb 100644
--- a/Chart/ScatterplotChart.js
+++ b/Chart/ScatterplotChart.js
@@ -113,7 +113,7 @@
 
     jsOMS.Chart.ScatterplotChart.prototype.drawData = function (svg, x, y, dataPointEnter, dataPoint)
     {
-        let self = this;
+        const self = this;
 
         dataPoint = svg.selectAll(".dataPoint").data(this.chart.dataset, function (c)
         {
diff --git a/Chart/VWaterfallChart.js b/Chart/VWaterfallChart.js
index 76bb8d7..1cd3629 100644
--- a/Chart/VWaterfallChart.js
+++ b/Chart/VWaterfallChart.js
@@ -124,7 +124,7 @@
 
     jsOMS.Chart.VWaterfallChart.prototype.drawData = function (svg, x, y, dataPointEnter, dataPoint)
     {
-        let self = this;
+        const self = this;
 
         dataPoint = svg.selectAll(".dataPoint").data(this.chart.dataset[0].points, function (c)
         {
diff --git a/Chart/WaterfallChart.js b/Chart/WaterfallChart.js
index 8b0149a..c5d7e65 100644
--- a/Chart/WaterfallChart.js
+++ b/Chart/WaterfallChart.js
@@ -124,7 +124,7 @@
 
     jsOMS.Chart.WaterfallChart.prototype.drawData = function (svg, x, y, dataPointEnter, dataPoint)
     {
-        let self = this;
+        const self = this;
 
         dataPoint = svg.selectAll(".dataPoint").data(this.chart.dataset[0].points, function (c)
         {
diff --git a/Message/Notification/Browser/BrowserNotification.js b/Message/Notification/Browser/BrowserNotification.js
index 2a66166..742b6a0 100644
--- a/Message/Notification/Browser/BrowserNotification.js
+++ b/Message/Notification/Browser/BrowserNotification.js
@@ -25,7 +25,7 @@
 
     jsOMS.Message.Notification.Browser.BrowserNotification.prototype.requestPermission = function()
     {
-        let self = this;
+        const self = this;
 
         if(Notification.permission !== 'granted' && Notification.permission !== 'denied') {
             Notification.requestPermission(function(permission) {
diff --git a/UI/UIManager.js b/UI/UIManager.js
index da8a508..79354e1 100644
--- a/UI/UIManager.js
+++ b/UI/UIManager.js
@@ -30,7 +30,7 @@
         this.dragNDrop     = new jsOMS.UI.DragNDrop(this.app);
         this.generalUI     = new jsOMS.UI.GeneralUI();
 
-        let self = this;
+        const self = this;
         this.domObserver = new MutationObserver(function(mutations) {
             const length = mutations.length;