diff --git a/src/asset_manager/index.js b/src/asset_manager/index.js
index 50603b26f..d3cb1f31e 100644
--- a/src/asset_manager/index.js
+++ b/src/asset_manager/index.js
@@ -119,7 +119,7 @@ module.exports = () => {
      * var asset = assetManager.get('http://img.jpg');
      */
     get(src) {
-      return assets.where({src: src})[0];
+      return assets.where({src})[0];
     },
 
     /**
diff --git a/src/asset_manager/view/AssetImageView.js b/src/asset_manager/view/AssetImageView.js
index 788a2c04f..fd369e525 100644
--- a/src/asset_manager/view/AssetImageView.js
+++ b/src/asset_manager/view/AssetImageView.js
@@ -96,9 +96,9 @@ module.exports = AssetView.extend({
     name = name && name.length > 30 ? name.substring(0, 30)+'...' : name;
     dim = dim ? dim + (this.model.get('unitDim') ? this.model.get('unitDim') : ' px' ) : '';
     this.$el.html( this.template({
-      name: name,
+      name,
       src: this.model.get('src'),
-      dim: dim,
+      dim,
       pfx: this.pfx,
       ppfx: this.ppfx
     }));
diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js
index 8d79780c4..0d0c6199d 100644
--- a/src/asset_manager/view/AssetsView.js
+++ b/src/asset_manager/view/AssetsView.js
@@ -109,7 +109,7 @@ module.exports = Backbone.View.extend({
       viewObject  = AssetImageView;
 
     var view     = new viewObject({
-      model  : model,
+      model,
       config  : this.config,
     });
     var rendered  = view.render().el;
diff --git a/src/block_manager/view/BlocksView.js b/src/block_manager/view/BlocksView.js
index 9b598c2ce..5afa22545 100644
--- a/src/block_manager/view/BlocksView.js
+++ b/src/block_manager/view/BlocksView.js
@@ -91,7 +91,7 @@ module.exports = Backbone.View.extend({
   add(model, fragment) {
     var frag = fragment || null;
     var view = new BlockView({
-      model: model,
+      model,
       attributes: model.get('attributes'),
     }, this.config);
     var rendered = view.render().el;
diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js
index a88fc7eac..f88bbd1e6 100644
--- a/src/canvas/view/CanvasView.js
+++ b/src/canvas/view/CanvasView.js
@@ -161,8 +161,8 @@ module.exports = Backbone.View.extend({
     var top = eo.top + frmOff.top - cvsOff.top;
     var left = eo.left + frmOff.left - cvsOff.left;
     return {
-      top: top,
-      left: left,
+      top,
+      left,
       height: el.offsetHeight,
       width: el.offsetWidth
     };
diff --git a/src/code_manager/model/HtmlGenerator.js b/src/code_manager/model/HtmlGenerator.js
index 88dc4afec..3bce93f0e 100644
--- a/src/code_manager/model/HtmlGenerator.js
+++ b/src/code_manager/model/HtmlGenerator.js
@@ -9,7 +9,7 @@ module.exports = Backbone.Model.extend({
 
     coll.each(m => {
       code += m.toHTML({
-        cssc: cssc
+        cssc
       });
     }, this);
 
diff --git a/src/code_manager/model/JsGenerator.js b/src/code_manager/model/JsGenerator.js
index 948031559..e6dc20440 100644
--- a/src/code_manager/model/JsGenerator.js
+++ b/src/code_manager/model/JsGenerator.js
@@ -12,7 +12,7 @@ module.exports = Backbone.Model.extend({
     if (script) {
       // If the component has scripts we need to expose his ID
       var attr = model.get('attributes');
-      attr = _.extend({}, attr, {id: id});
+      attr = _.extend({}, attr, {id});
       model.set('attributes', attr);
 
       var scrStr = 'function(){' + script + '}';
diff --git a/src/commands/index.js b/src/commands/index.js
index 89c8c3b83..38f3e309a 100644
--- a/src/commands/index.js
+++ b/src/commands/index.js
@@ -189,7 +189,7 @@ module.exports = () => {
      * 	},
      * });
      * */
-    add: add,
+    add,
 
     /**
      * Get command by ID
diff --git a/src/commands/view/ExportTemplate.js b/src/commands/view/ExportTemplate.js
index 300e2339b..8a1b911a5 100644
--- a/src/commands/view/ExportTemplate.js
+++ b/src/commands/view/ExportTemplate.js
@@ -28,9 +28,9 @@ module.exports = {
     var $input     = $('<textarea>'),
 
       editor    = this.codeMirror.clone().set({
-        label    : label,
-        codeName  : codeName,
-        theme    : theme,
+        label,
+        codeName,
+        theme,
         input    : $input[0],
       }),
 
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index cb0a46293..2953c08df 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -178,7 +178,7 @@ module.exports = {
       return;
     }
     this.editor.runCommand('show-offset', {
-      el: el,
+      el,
       elPos: pos,
     });
   },
@@ -199,7 +199,7 @@ module.exports = {
    */
   showFixedElementOffset(el, pos) {
     this.editor.runCommand('show-offset', {
-      el: el,
+      el,
       elPos: pos,
       state: 'Fixed',
     });
@@ -373,7 +373,7 @@ module.exports = {
     var toolbarEl = this.canvas.getToolbarEl();
     var toolbarStyle = toolbarEl.style;
     var pos = this.canvas.getTargetToElementDim(toolbarEl, el, {
-      elPos: elPos,
+      elPos,
       event: 'toolbarPosUpdate',
     });
     var leftPos = pos.left + pos.elementWidth - pos.targetWidth;
diff --git a/src/commands/view/SelectPosition.js b/src/commands/view/SelectPosition.js
index 889bdac73..1d32db9f0 100644
--- a/src/commands/view/SelectPosition.js
+++ b/src/commands/view/SelectPosition.js
@@ -35,7 +35,7 @@ module.exports = {
     var canvasOff = this.offset(this.canvas.getElement());
     var top = frameOff.top - canvasOff.top;
     var left = frameOff.left - canvasOff.left;
-    return { top: top, left: left };
+    return { top, left };
   },
 
   /**
diff --git a/src/css_composer/index.js b/src/css_composer/index.js
index c527381fe..8746da37d 100644
--- a/src/css_composer/index.js
+++ b/src/css_composer/index.js
@@ -34,7 +34,7 @@ module.exports = () => {
 
   return {
 
-      Selectors: Selectors,
+      Selectors,
 
       /**
        * Name of the module
diff --git a/src/css_composer/view/CssRulesView.js b/src/css_composer/view/CssRulesView.js
index 024eea349..c56fd24a9 100644
--- a/src/css_composer/view/CssRulesView.js
+++ b/src/css_composer/view/CssRulesView.js
@@ -33,7 +33,7 @@ module.exports = Backbone.View.extend({
     var viewObject  = CssRuleView;
 
     var view = new viewObject({
-        model: model,
+        model,
         config: this.config,
     });
     var rendered  = view.render().el;
diff --git a/src/dom_components/index.js b/src/dom_components/index.js
index a86ec0475..92e0a074f 100644
--- a/src/dom_components/index.js
+++ b/src/dom_components/index.js
@@ -164,8 +164,8 @@ module.exports = () => {
       component = new Component(c.wrapper, {
         sm: c.em,
         config: c,
-        defaultTypes: defaultTypes,
-        componentTypes: componentTypes,
+        defaultTypes,
+        componentTypes,
       });
       component.set({ attributes: {id: 'wrapper'}});
 
@@ -176,8 +176,8 @@ module.exports = () => {
       componentView = new ComponentView({
         model: component,
         config: c,
-        defaultTypes: defaultTypes,
-        componentTypes: componentTypes,
+        defaultTypes,
+        componentTypes,
       });
       return this;
     },
diff --git a/src/dom_components/model/ComponentImage.js b/src/dom_components/model/ComponentImage.js
index a5cfeabb4..93dd24232 100644
--- a/src/dom_components/model/ComponentImage.js
+++ b/src/dom_components/model/ComponentImage.js
@@ -76,7 +76,7 @@ module.exports = Component.extend({
       search: el.search,
       hash: el.hash,
       port: el.port,
-      query: query,
+      query,
     };
   },
 
diff --git a/src/dom_components/view/ComponentsView.js b/src/dom_components/view/ComponentsView.js
index d75592f0e..a0767087f 100644
--- a/src/dom_components/view/ComponentsView.js
+++ b/src/dom_components/view/ComponentsView.js
@@ -59,7 +59,7 @@ module.exports = Backbone.View.extend({
     //viewObject = dt[type] ? dt[type].view : dt.default.view;
 
     var view = new viewObject({
-      model: model,
+      model,
       config: this.config,
       defaultTypes: dt,
       componentTypes: ct,
diff --git a/src/domain_abstract/ui/InputNumber.js b/src/domain_abstract/ui/InputNumber.js
index b17158eb5..fb994e7fd 100644
--- a/src/domain_abstract/ui/InputNumber.js
+++ b/src/domain_abstract/ui/InputNumber.js
@@ -234,15 +234,15 @@ module.exports = Backbone.View.extend({
       val = val < min ? min : val;
 
     return {
-      force: force,
+      force,
       value: val,
-      unit: unit
+      unit
     };
   },
 
   render() {
     var ppfx = this.ppfx;
-    this.$el.html(this.template({ppfx: ppfx}));
+    this.$el.html(this.template({ppfx}));
     this.$el.find('.'+ ppfx +'input-holder').html(this.getInputEl());
     this.$el.find('.' + ppfx + 'field-units').html(this.getUnitEl());
     this.$el.addClass(this.contClass);
diff --git a/src/domain_abstract/view/DomainViews.js b/src/domain_abstract/view/DomainViews.js
index e3ee3a71d..6b1d2e708 100644
--- a/src/domain_abstract/view/DomainViews.js
+++ b/src/domain_abstract/view/DomainViews.js
@@ -38,7 +38,7 @@ module.exports = Backbone.View.extend({
       itemView = this.itemsView[typeField];
     }
     var view = new itemView({
-      model: model,
+      model,
       config: this.config
     }, this.config);
     var rendered = view.render().el;
diff --git a/src/grapesjs/index.js b/src/grapesjs/index.js
index ac9d6f7d5..4bde4985c 100644
--- a/src/grapesjs/index.js
+++ b/src/grapesjs/index.js
@@ -12,9 +12,9 @@
 
   return {
 
-    editors: editors,
+    editors,
 
-    plugins: plugins,
+    plugins,
 
     /**
      * Initializes an editor based on passed options
diff --git a/src/modal_dialog/index.js b/src/modal_dialog/index.js
index 46536cefa..96a33a093 100644
--- a/src/modal_dialog/index.js
+++ b/src/modal_dialog/index.js
@@ -48,7 +48,7 @@ module.exports = () => {
 
       model = new ModalM(c);
       modal = new ModalView({
-        model: model,
+        model,
         config: c,
       });
 
diff --git a/src/navigator/index.js b/src/navigator/index.js
index 2ca7ed152..d81c5e4bc 100644
--- a/src/navigator/index.js
+++ b/src/navigator/index.js
@@ -10,8 +10,8 @@ function Navigator(collection, c) {
   }
 
   var obj = {
-    collection: collection,
-    config: config,
+    collection,
+    config,
     opened: c.opened || {}
   };
 
diff --git a/src/navigator/view/ItemView.js b/src/navigator/view/ItemView.js
index 5d6cab353..05555c589 100644
--- a/src/navigator/view/ItemView.js
+++ b/src/navigator/view/ItemView.js
@@ -275,7 +275,7 @@ module.exports = Backbone.View.extend({
       editBtnCls: this.editBtnCls,
       inputNameCls: this.inputNameCls,
       caretCls: this.caretCls,
-      count: count,
+      count,
       visible: vis,
       hidable: this.config.hidable,
       prefix: pfx,
diff --git a/src/navigator/view/ItemsView.js b/src/navigator/view/ItemsView.js
index 9856c99cf..e17cf95e9 100644
--- a/src/navigator/view/ItemsView.js
+++ b/src/navigator/view/ItemsView.js
@@ -22,7 +22,7 @@ module.exports = Backbone.View.extend({
         containerSel: '.' + pfx + 'items',
         itemSel: '.' + pfx + 'item',
         ppfx: this.ppfx,
-        pfx: pfx,
+        pfx,
         nested: 1
       });
     }
@@ -60,7 +60,7 @@ module.exports = Backbone.View.extend({
     var viewObject  = ItemView;
 
     var view = new viewObject({
-      model: model,
+      model,
       config: this.config,
       sorter: this.sorter,
       isCountable: this.isCountable,
diff --git a/src/panels/index.js b/src/panels/index.js
index 11b74947f..2fed77a45 100644
--- a/src/panels/index.js
+++ b/src/panels/index.js
@@ -124,7 +124,7 @@ module.exports = () => {
      * var myPanel = panelManager.getPanel('myNewPanel');
      */
     getPanel(id) {
-      var res  = panels.where({id: id});
+      var res  = panels.where({id});
       return res.length ? res[0] : null;
     },
 
@@ -174,7 +174,7 @@ module.exports = () => {
     getButton(panelId, id) {
       var pn  = this.getPanel(panelId);
       if(pn){
-        var res  = pn.get('buttons').where({id: id});
+        var res  = pn.get('buttons').where({id});
         return res.length ? res[0] : null;
       }
       return null;
@@ -201,7 +201,7 @@ module.exports = () => {
         });
     },
 
-    Panel: Panel,
+    Panel,
 
   };
 };
diff --git a/src/panels/view/ButtonsView.js b/src/panels/view/ButtonsView.js
index e77943ac4..8f48aca1c 100644
--- a/src/panels/view/ButtonsView.js
+++ b/src/panels/view/ButtonsView.js
@@ -35,7 +35,7 @@ module.exports = Backbone.View.extend({
     var viewObject  = ButtonView;
 
     var view     = new viewObject({
-      model   : model,
+      model,
       config  : this.config,
       parentM  : this.parentM
     });
diff --git a/src/panels/view/PanelsView.js b/src/panels/view/PanelsView.js
index 5676802df..7826158c0 100644
--- a/src/panels/view/PanelsView.js
+++ b/src/panels/view/PanelsView.js
@@ -37,7 +37,7 @@ module.exports = Backbone.View.extend({
     var viewObject = PanelView;
 
     var view = new viewObject({
-      model: model,
+      model,
       config: this.config,
     });
     var rendered = view.render().el;
diff --git a/src/parser/model/ParserCss.js b/src/parser/model/ParserCss.js
index 416681266..015593084 100644
--- a/src/parser/model/ParserCss.js
+++ b/src/parser/model/ParserCss.js
@@ -30,8 +30,8 @@ module.exports = config => ({
       }
     }
     return {
-      result: result,
-      add: add,
+      result,
+      add,
     };
   },
 
@@ -109,7 +109,7 @@ module.exports = config => ({
           result.push({
             selectors: [],
             selectorsAdd: selsAddStr,
-            style: style,
+            style,
           });
         }
       }
diff --git a/src/rich_text_editor/index.js b/src/rich_text_editor/index.js
index f25866d86..71c37b324 100644
--- a/src/rich_text_editor/index.js
+++ b/src/rich_text_editor/index.js
@@ -101,7 +101,7 @@ module.exports = () => {
      * var cm = rte.get('fontSize');
      */
     get(command) {
-      return commands.where({command: command})[0];
+      return commands.where({command})[0];
     },
 
     /**
diff --git a/src/rich_text_editor/view/CommandButtonsView.js b/src/rich_text_editor/view/CommandButtonsView.js
index e7e1f23d0..b3f5d1089 100644
--- a/src/rich_text_editor/view/CommandButtonsView.js
+++ b/src/rich_text_editor/view/CommandButtonsView.js
@@ -48,7 +48,7 @@ module.exports = Backbone.View.extend({
     if(args)
       attrs['data-args'] = args;
     var view = new viewObj({
-      model: model,
+      model,
       attributes: attrs,
     }, this.config);
 
diff --git a/src/selector_manager/index.js b/src/selector_manager/index.js
index 26037444f..9c258e78c 100644
--- a/src/selector_manager/index.js
+++ b/src/selector_manager/index.js
@@ -126,7 +126,7 @@ module.exports = config => {
      * var selector = selectorManager.get('selectorName');
      * */
     get(name) {
-      return selectors.where({name: name})[0];
+      return selectors.where({name})[0];
     },
 
     /**
diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js
index dd2a6fa39..5d3b7e8fa 100644
--- a/src/selector_manager/view/ClassTagsView.js
+++ b/src/selector_manager/view/ClassTagsView.js
@@ -226,7 +226,7 @@ module.exports = Backbone.View.extend({
     var fragment  = fragmentEl || null;
 
     var view = new ClassTagView({
-        model:  model,
+        model,
         config: this.config,
         coll: this.collection,
     });
diff --git a/src/style_manager/index.js b/src/style_manager/index.js
index 8673732d3..15215a1c8 100644
--- a/src/style_manager/index.js
+++ b/src/style_manager/index.js
@@ -129,7 +129,7 @@ module.exports = () => {
      * var sector = styleManager.getSector('mySector');
      * */
     getSector(id) {
-      var res  = sectors.where({id: id});
+      var res  = sectors.where({id});
       return res.length ? res[0] : null;
     },
 
diff --git a/src/style_manager/view/LayersView.js b/src/style_manager/view/LayersView.js
index 1ed8627d6..51a6c1690 100644
--- a/src/style_manager/view/LayersView.js
+++ b/src/style_manager/view/LayersView.js
@@ -56,7 +56,7 @@ module.exports = Backbone.View.extend({
     }
 
     var view = new viewObject({
-        model: model,
+        model,
         stackModel: this.stackModel,
         config: this.config,
         sorter: this.sorter
diff --git a/src/style_manager/view/PropertiesView.js b/src/style_manager/view/PropertiesView.js
index 21b0ed0d8..ac9660a0e 100644
--- a/src/style_manager/view/PropertiesView.js
+++ b/src/style_manager/view/PropertiesView.js
@@ -44,7 +44,7 @@ module.exports = Backbone.View.extend({
       }
 
       var view = new objView({
-        model: model,
+        model,
         name: model.get('name'),
         id: this.pfx + model.get('property'),
         target: this.target,
diff --git a/src/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js
index 0e0bf1625..e4392f345 100644
--- a/src/style_manager/view/SectorsView.js
+++ b/src/style_manager/view/SectorsView.js
@@ -103,7 +103,7 @@ module.exports = Backbone.View.extend({
     var viewObject = SectorView;
 
     var view = new viewObject({
-      model: model,
+      model,
       id: this.pfx + model.get('name').replace(' ','_').toLowerCase(),
       name: model.get('name'),
       properties: model.get('properties'),
diff --git a/src/trait_manager/index.js b/src/trait_manager/index.js
index 0eb683061..095481cbb 100644
--- a/src/trait_manager/index.js
+++ b/src/trait_manager/index.js
@@ -7,7 +7,7 @@ module.exports = () => {
 
   return {
 
-    TraitsView: TraitsView,
+    TraitsView,
 
     /**
      * Name of the module
diff --git a/src/utils/index.js b/src/utils/index.js
index ec6a05eca..6e1c98e15 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -19,8 +19,8 @@ module.exports = () => {
       return this;
     },
 
-    Sorter: Sorter,
+    Sorter,
 
-    Resizer: Resizer,
+    Resizer,
   };
 };