diff --git a/src/javascripts/ng-admin/es6/lib/DataStore/DataStore.js b/src/javascripts/ng-admin/es6/lib/DataStore/DataStore.js
index 4fcc82d7..6870ed61 100644
--- a/src/javascripts/ng-admin/es6/lib/DataStore/DataStore.js
+++ b/src/javascripts/ng-admin/es6/lib/DataStore/DataStore.js
@@ -72,23 +72,15 @@ class DataStore {
     }
 
     fillReferencesValuesFromEntry(entry, referencedValues, fillSimpleReference) {
-        let reference,
-            referenceField,
-            choices,
-            entries,
-            identifier,
-            id,
-            i;
-
-        for (referenceField in referencedValues) {
-            reference = referencedValues[referenceField];
-            choices = this.getReferenceChoicesById(reference);
-            entries = [];
-            identifier = reference.getMappedValue(entry.values[referenceField], entry.values);
+        for (let referenceField in referencedValues) {
+            let reference = referencedValues[referenceField],
+                choices = this.getReferenceChoicesById(reference),
+                entries = [],
+                identifier = reference.getMappedValue(entry.values[referenceField], entry.values);
 
             if (reference.type() === 'reference_many') {
-                for (i in identifier) {
-                    id = identifier[i];
+                for (let i in identifier) {
+                    let id = identifier[i];
                     entries.push(choices[id]);
                 }
 
@@ -102,10 +94,10 @@ class DataStore {
     }
 
     getReferenceChoicesById(field) {
-        let result = {};
-        let targetField = field.targetField().name();
-        let targetIdentifier = field.targetEntity().identifier().name();
-        let entries = this.getEntries(field.targetEntity().uniqueId + '_values');
+        let result = {},
+            targetField = field.targetField().name(),
+            targetIdentifier = field.targetEntity().identifier().name(),
+            entries = this.getEntries(field.targetEntity().uniqueId + '_values');
 
         for (let i = 0, l = entries.length ; i < l ; i++) {
             let entry = entries[i];
diff --git a/src/javascripts/ng-admin/es6/lib/Queries/ReadQueries.js b/src/javascripts/ng-admin/es6/lib/Queries/ReadQueries.js
index e67740ae..63fc9963 100644
--- a/src/javascripts/ng-admin/es6/lib/Queries/ReadQueries.js
+++ b/src/javascripts/ng-admin/es6/lib/Queries/ReadQueries.js
@@ -78,7 +78,6 @@ class ReadQueries extends Queries {
             let filterName;
 
             for (filterName in filterValues) {
-
                 if (filterFields.hasOwnProperty(filterName) && filterFields[filterName].hasMaps()) {
                     Object.assign(params._filters, filterFields[filterName].getMappedValue(filterValues[filterName]));
 
@@ -106,12 +105,11 @@ class ReadQueries extends Queries {
     getReferencedData(references, rawValues) {
         let getRawValues = this.getRawValues.bind(this),
             getOne = this.getOne.bind(this),
-            referencedData = {},
             identifiers,
             calls = [],
             data;
 
-        for (i in references) {
+        for (let i in references) {
             let reference = references[i],
                 targetEntity = reference.targetEntity();
 
@@ -144,7 +142,8 @@ class ReadQueries extends Queries {
                     return {};
                 }
 
-                let response,
+                let referencedData = {},
+                    response,
                     i = 0;
 
                 for (let j in references) {
@@ -200,7 +199,7 @@ class ReadQueries extends Queries {
         let getRawValues = this.getRawValues.bind(this),
             calls = [];
 
-        for (i in referencedLists) {
+        for (let i in referencedLists) {
             let referencedList = referencedLists[i],
                 targetEntity = referencedList.targetEntity(),
                 viewName = targetEntity.name() + '_ListView',
diff --git a/src/javascripts/ng-admin/es6/lib/View/View.js b/src/javascripts/ng-admin/es6/lib/View/View.js
index 93a3bf82..b3dbff9c 100644
--- a/src/javascripts/ng-admin/es6/lib/View/View.js
+++ b/src/javascripts/ng-admin/es6/lib/View/View.js
@@ -225,7 +225,7 @@ class View {
     validate(entry) {
         this._fields.map(function (field) {
             let validation = field.validation();
-            
+
             if (typeof validation.validator === 'function') {
                 validation.validator(entry.values[field.name()]);
             }