diff --git a/.eslintrc b/.eslintrc
index b2c97ae30..4f9f7c6b6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,17 +1,23 @@
 {
   "extends": "airbnb",
   "rules": {
+    "max-len": [1, 160, 2, {"ignoreComments": true}],
+    "semi": ["error", "always"],
+    "object-property-newline": ["off", { "allowMultiplePropertiesPerLine": true }],
     "func-names": ["off", "never"],
+    "space-before-function-paren": ["error", "never"],
+    "no-trailing-spaces": ["error", { "skipBlankLines": true }],
+    "no-mixed-operators": ["error", {"allowSamePrecedence": true}],
     "linebreak-style": ["off"],
+    "no-use-before-define": ["error", { "variables": false, "classes": false, "functions": false }],
+
     "no-var": ["off"],
     "dot-notation": ["off"],
     "one-var": ["off"],
-    "no-mixed-operators": ["error", {"allowSamePrecedence": true}],
     "one-var-declaration-per-line": ["off"],
     "no-prototype-builtins": ["off"],
     "arrow-parens": ["off"],
     "quote-props": ["off"],
-    "no-use-before-define": ["off"],
     "no-underscore-dangle": ["off"],
     "vars-on-top": ["off"],
     "no-param-reassign": ["off"],
@@ -26,25 +32,9 @@
     "object-curly-spacing": ["off"],
     "no-plusplus": ["off"],
     "no-unused-expressions": ["off"],
-    "no-trailing-spaces": ["error", { "skipBlankLines": true }],
     "global-require": ["off"],
-    "no-sparse-arrays": ["off"],
-    "comma-spacing": ["off"],
-    "brace-style": ["off"],
-    "space-before-function-paren": ["off"],
     "no-unused-vars": ["off"],
-    "key-spacing": ["off"],
-    "object-property-newline": ["off"],
-    "block-spacing": ["off"],
-    "consistent-return": ["off"],
-    "keyword-spacing": ["off"],
-    "semi": ["off"],
     "no-path-concat": ["off"],
-    "prefer-rest-params": ["off"],
-    "max-len": [1, 160, 2, {"ignoreComments": true}]
-  },
-  "globals": {
-    "describe": true,
-    "it": true
+    "prefer-rest-params": ["off"]
   }
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 8e8307a83..024a2e11e 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,8 @@ npm install exceljs
 <ul>
     <li>
         Switching to transpiled code for distribution.
-        This will ensure compatability with 4.0.0 and above from here on. 
+        This will ensure compatability with 4.0.0 and above from here on.
+        And it will also allow use of much more expressive JS code in the lib folder!
     </li>
     <li>
         <a href="#images">Basic Image Support!</a>
@@ -34,6 +35,7 @@ To be clear, all contributions added to this library will be included in the lib
 # Backlog
 
 <ul>
+  <li>ESLint - slowly turn on (justifyable) rules which should hopefully make contributions easier.</li>
   <li>Conditional Formatting.</li>
   <li>There are still more print-settings to add; Fixed rows/cols, etc.</li>
   <li>XLSX Streaming Reader.</li>
diff --git a/lib/csv/csv.js b/lib/csv/csv.js
index 2657b011e..01eb29172 100644
--- a/lib/csv/csv.js
+++ b/lib/csv/csv.js
@@ -138,7 +138,7 @@ CSV.prototype = {
       var includeEmptyRows = (options.includeEmptyRows === undefined) || options.includeEmptyRows;
       var lastRow = 1;
       if (worksheet) {
-        worksheet.eachRow(function (row, rowNumber) {
+        worksheet.eachRow(function(row, rowNumber) {
           if (includeEmptyRows) {
             while (lastRow++ < rowNumber - 1) {
               csvStream.write([]);
diff --git a/lib/csv/stream-converter.js b/lib/csv/stream-converter.js
index 5d1fff92a..874a0fbb4 100644
--- a/lib/csv/stream-converter.js
+++ b/lib/csv/stream-converter.js
@@ -7,7 +7,7 @@
 // Work in Progress - Will complete this at some point
 var jconv;
 
-var StreamConverter = module.exports = function (inner, options) {
+var StreamConverter = module.exports = function(inner, options) {
   this.inner = inner;
 
   options = options || {};
@@ -50,7 +50,7 @@ StreamConverter.prototype.addListener = function(event, handler) {
 
 StreamConverter.prototype.removeListener = function(event, handler) {
   this.inner.removeListener(event, handler);
-}
+};
 
 StreamConverter.prototype.write = function(data, encoding, callback) {
   if (encoding instanceof Function) {
@@ -96,7 +96,7 @@ StreamConverter.prototype.pipe = function(destination, options) {
     outerBOM: this.innerBOM
   });
 
-  this.inner.pipe(reverseConverter, options)
+  this.inner.pipe(reverseConverter, options);
 };
 
 StreamConverter.prototype.close = function() {
diff --git a/lib/doc/cell.js b/lib/doc/cell.js
index 4d6baaf6a..83658c0a5 100644
--- a/lib/doc/cell.js
+++ b/lib/doc/cell.js
@@ -201,7 +201,7 @@ Cell.prototype = {
   },
   get text() {
     return this._value.toString();
-  } ,
+  },
   toString: function() {
     return this.text;
   },
@@ -273,7 +273,7 @@ Cell.prototype = {
   },
 
   get dataValidation() {
-    return this._dataValidations.find(this.address)
+    return this._dataValidations.find(this.address);
   },
 
   set dataValidation(value) {
@@ -858,7 +858,7 @@ JSONValue.prototype = {
 
 // Value is a place to hold common static Value type functions
 var Value = {
-  getType:  function(value) {
+  getType: function(value) {
     if ((value === null) || (value === undefined)) {
       return Cell.Types.Null;
     } else if ((value instanceof String) || (typeof value === 'string')) {
@@ -885,19 +885,19 @@ var Value = {
 
   // map valueType to constructor
   types: [
-    {t:Cell.Types.Null, f:NullValue},
-    {t:Cell.Types.Number, f:NumberValue},
-    {t:Cell.Types.String, f:StringValue},
-    {t:Cell.Types.Date, f:DateValue},
-    {t:Cell.Types.Hyperlink, f:HyperlinkValue},
-    {t:Cell.Types.Formula, f:FormulaValue},
-    {t:Cell.Types.Merge, f:MergeValue},
-    {t:Cell.Types.JSON, f:JSONValue},
-    {t:Cell.Types.SharedString, f:SharedStringValue},
-    {t:Cell.Types.RichText, f:RichTextValue},
-    {t:Cell.Types.Boolean, f:BooleanValue},
-    {t:Cell.Types.Error, f:ErrorValue},
-  ].reduce((p,t) => { p[t.t] = t.f; return p; }, []),
+    {t: Cell.Types.Null, f: NullValue},
+    {t: Cell.Types.Number, f: NumberValue},
+    {t: Cell.Types.String, f: StringValue},
+    {t: Cell.Types.Date, f: DateValue},
+    {t: Cell.Types.Hyperlink, f: HyperlinkValue},
+    {t: Cell.Types.Formula, f: FormulaValue},
+    {t: Cell.Types.Merge, f: MergeValue},
+    {t: Cell.Types.JSON, f: JSONValue},
+    {t: Cell.Types.SharedString, f: SharedStringValue},
+    {t: Cell.Types.RichText, f: RichTextValue},
+    {t: Cell.Types.Boolean, f: BooleanValue},
+    {t: Cell.Types.Error, f: ErrorValue},
+  ].reduce((p, t) => { p[t.t] = t.f; return p; }, []),
 
   create: function(type, cell, value) {
     var T = this.types[type];
diff --git a/lib/doc/column.js b/lib/doc/column.js
index ee5f57b1e..dcc4b3ff9 100644
--- a/lib/doc/column.js
+++ b/lib/doc/column.js
@@ -12,7 +12,7 @@ var colCache = require('../utils/col-cache');
 // Column defines the column properties for 1 column.
 // This includes header rows, widths, key, (style), etc.
 // Worksheet will condense the columns as appropriate during serialization
-var Column = module.exports = function (worksheet, number, defn) {
+var Column = module.exports = function(worksheet, number, defn) {
   this._worksheet = worksheet;
   this._number = number;
   if (defn !== false) {
@@ -51,9 +51,8 @@ Column.prototype = {
       this.outlineLevel = value.outlineLevel;
       if (value.style) {
         this.style = value.style;
-      }
-      else {
-        this.style = {}
+      } else {
+        this.style = {};
       }
 
       // headers must be set after style
@@ -77,7 +76,7 @@ Column.prototype = {
     if (value !== undefined) {
       var self = this;
       this._header = value;
-      this.headers.forEach(function (text, index) {
+      this.headers.forEach(function(text, index) {
         self._worksheet.getCell(index + 1, self.number).value = text;
       });
     } else {
@@ -112,14 +111,14 @@ Column.prototype = {
     return !!(this._outlineLevel && (this._outlineLevel >= this._worksheet.properties.outlineLevelCol));
   },
 
-  toString: function () {
+  toString: function() {
     return JSON.stringify({
       key: this.key,
       width: this.width,
       headers: this.headers.length ? this.headers : undefined
     });
   },
-  equivalentTo: function (other) {
+  equivalentTo: function(other) {
     return (this.width === other.width) &&
             (this.hidden === other.hidden) &&
             (this.outlineLevel === other.outlineLevel) &&
@@ -145,18 +144,18 @@ Column.prototype = {
     return this.headers.length;
   },
 
-  eachCell: function (options, iteratee) {
+  eachCell: function(options, iteratee) {
     var colNumber = this.number;
     if (!iteratee) {
       iteratee = options;
       options = null;
     }
     if (options && options.includeEmpty) {
-      this._worksheet.eachRow(options, function (row, rowNumber) {
+      this._worksheet.eachRow(options, function(row, rowNumber) {
         iteratee(row.getCell(colNumber), rowNumber);
       });
     } else {
-      this._worksheet.eachRow(function (row, rowNumber) {
+      this._worksheet.eachRow(function(row, rowNumber) {
         var cell = row.findCell(colNumber);
         if (cell) {
           iteratee(cell, rowNumber);
@@ -167,9 +166,9 @@ Column.prototype = {
 
   // =========================================================================
   // styles
-  _applyStyle: function (name, value) {
+  _applyStyle: function(name, value) {
     this.style[name] = value;
-    this.eachCell(function (cell) {
+    this.eachCell(function(cell) {
       cell[name] = value;
     });
     return value;
@@ -210,12 +209,12 @@ Column.prototype = {
 // =============================================================================
 // static functions
 
-Column.toModel = function (columns) {
+Column.toModel = function(columns) {
   // Convert array of Column into compressed list cols
   var cols = [];
   var col = null;
   if (columns) {
-    columns.forEach(function (column, index) {
+    columns.forEach(function(column, index) {
       if (column.isDefault) {
         if (col) {
           col = null;
@@ -240,7 +239,7 @@ Column.toModel = function (columns) {
   return cols.length ? cols : undefined;
 };
 
-Column.fromModel = function (worksheet, cols) {
+Column.fromModel = function(worksheet, cols) {
   cols = cols || [];
   var columns = [];
   var count = 1;
diff --git a/lib/doc/defined-names.js b/lib/doc/defined-names.js
index 1929ac425..69fbae2b7 100644
--- a/lib/doc/defined-names.js
+++ b/lib/doc/defined-names.js
@@ -11,7 +11,7 @@ var colCache = require('../utils/col-cache');
 var CellMatrix = require('../utils/cell-matrix');
 var Range = require('./range');
 
-var rangeRegexp = /\$(\w+)\$(\d+)(:\$(\w+)\$(\d+))?/;
+var rangeRegexp = /[$](\w+)[$](\d+)(:[$](\w+)[$](\d+))?/;
 
 var DefinedNames = module.exports = function() {
   this.matrixMap = {};
@@ -74,11 +74,10 @@ DefinedNames.prototype = {
     return this.getNamesEx(colCache.decodeEx(addressStr));
   },
   getNamesEx: function(address) {
-    return _.map(this.matrixMap, function(matrix, name) {
-      if (matrix.findCellEx(address)) {
-        return name;
-      }
-    }).filter(function(name) { return name; });
+    return _.map(
+      this.matrixMap,
+      (matrix, name) => matrix.findCellEx(address) && name
+    ).filter(Boolean);
   },
 
   _explore: function(matrix, cell) {
@@ -159,7 +158,7 @@ DefinedNames.prototype = {
     value.forEach(function(definedName) {
       var matrix = matrixMap[definedName.name] = new CellMatrix();
       definedName.ranges.forEach(function(rangeStr) {
-        if(rangeRegexp.test(rangeStr.split('!').pop() || '')) {
+        if (rangeRegexp.test(rangeStr.split('!').pop() || '')) {
           matrix.addCell(rangeStr);
         }
       });
diff --git a/lib/doc/range.js b/lib/doc/range.js
index 6d5774fae..6eb8f5d05 100644
--- a/lib/doc/range.js
+++ b/lib/doc/range.js
@@ -14,12 +14,12 @@ var Range = module.exports = function() {
 };
 
 Range.prototype = {
-  _set_tlbr: function(t,l,b,r, s) {
+  _set_tlbr: function(t, l, b, r, s) {
     this.model = {
-      top: Math.min(t,b),
-      left: Math.min(l,r),
-      bottom: Math.max(t,b),
-      right: Math.max(l,r),
+      top: Math.min(t, b),
+      left: Math.min(l, r),
+      bottom: Math.max(t, b),
+      right: Math.max(l, r),
       sheetName: s
     };
   },
diff --git a/lib/doc/row.js b/lib/doc/row.js
index 1f1416197..c10b414f9 100644
--- a/lib/doc/row.js
+++ b/lib/doc/row.js
@@ -12,7 +12,7 @@ var Enums = require('./enums');
 var colCache = require('./../utils/col-cache');
 var Cell = require('./cell');
 
-var Row = module.exports = function (worksheet, number) {
+var Row = module.exports = function(worksheet, number) {
   this._worksheet = worksheet;
   this._number = number;
   this._cells = [];
@@ -32,23 +32,23 @@ Row.prototype = {
 
   // Inform Streaming Writer that this row (and all rows before it) are complete
   // and ready to write. Has no effect on Worksheet document
-  commit: function () {
+  commit: function() {
     this._worksheet._commitRow(this);
   },
 
   // helps GC by breaking cyclic references
-  destroy: function () {
+  destroy: function() {
     delete this._worksheet;
     delete this._cells;
     delete this.style;
   },
 
-  findCell: function (colNumber) {
+  findCell: function(colNumber) {
     return this._cells[colNumber - 1];
   },
 
   // given {address, row, col}, find or create new cell
-  _getCell: function (address) {
+  _getCell: function(address) {
     var cell = this._cells[address.col - 1];
     if (!cell) {
       var column = this._worksheet.getColumn(address.col);
@@ -59,7 +59,7 @@ Row.prototype = {
   },
 
   // get cell by key, letter or column number
-  getCell: function (col) {
+  getCell: function(col) {
     if (typeof col === 'string') {
       // is it a key?
       var column = this._worksheet._keys[col];
@@ -117,7 +117,7 @@ Row.prototype = {
   },
 
   // Iterate over all non-null cells in this row
-  eachCell: function (options, iteratee) {
+  eachCell: function(options, iteratee) {
     if (!iteratee) {
       iteratee = options;
       options = null;
@@ -128,7 +128,7 @@ Row.prototype = {
         iteratee(this.getCell(i), i);
       }
     } else {
-      this._cells.forEach(function (cell, index) {
+      this._cells.forEach(function(cell, index) {
         if (cell && (cell.type !== Enums.ValueType.Null)) {
           iteratee(cell, index + 1);
         }
@@ -139,7 +139,7 @@ Row.prototype = {
   // return a sparse array of cell values
   get values() {
     var values = [];
-    this._cells.forEach(function (cell) {
+    this._cells.forEach(function(cell) {
       if (cell && (cell.type !== Enums.ValueType.Null)) {
         values[cell.col] = cell.value;
       }
@@ -161,7 +161,7 @@ Row.prototype = {
         // contiguous array - start at column 1
         offset = 1;
       }
-      value.forEach(function (item, index) {
+      value.forEach(function(item, index) {
         if (item !== undefined) {
           self._getCell({
             address: colCache.encodeAddress(self._number, index + offset),
@@ -172,7 +172,7 @@ Row.prototype = {
       });
     } else {
       // assume object with column keys
-      _.each(this._worksheet._keys, function (column, key) {
+      _.each(this._worksheet._keys, function(column, key) {
         if (value[key] !== undefined) {
           self._getCell({
             address: colCache.encodeAddress(self._number, column.number),
@@ -186,7 +186,7 @@ Row.prototype = {
 
   // returns true if the row includes at least one cell with a value
   get hasValues() {
-    return _.some(this._cells, function (cell) {
+    return _.some(this._cells, function(cell) {
       return cell && (cell.type !== Enums.ValueType.Null);
     });
   },
@@ -206,7 +206,7 @@ Row.prototype = {
   get dimensions() {
     var min = 0;
     var max = 0;
-    this._cells.forEach(function (cell) {
+    this._cells.forEach(function(cell) {
       if (cell && (cell.type !== Enums.ValueType.Null)) {
         if (!min || (min > cell.col)) {
           min = cell.col;
@@ -224,9 +224,9 @@ Row.prototype = {
 
   // =========================================================================
   // styles
-  _applyStyle: function (name, value) {
+  _applyStyle: function(name, value) {
     this.style[name] = value;
-    this._cells.forEach(function (cell) {
+    this._cells.forEach(function(cell) {
       if (cell) { cell[name] = value; }
     });
     return value;
@@ -285,7 +285,7 @@ Row.prototype = {
     var cells = [];
     var min = 0;
     var max = 0;
-    this._cells.forEach(function (cell) {
+    this._cells.forEach(function(cell) {
       if (cell) {
         var cellModel = cell.model;
         if (cellModel) {
@@ -318,7 +318,7 @@ Row.prototype = {
     }
     var self = this;
     this._cells = [];
-    value.cells.forEach(function (cellModel) {
+    value.cells.forEach(function(cellModel) {
       switch (cellModel.type) {
         case Cell.Types.Merge:
           // special case - don't add this types
diff --git a/lib/doc/workbook.js b/lib/doc/workbook.js
index 63d822dbd..9015bbc44 100644
--- a/lib/doc/workbook.js
+++ b/lib/doc/workbook.js
@@ -156,7 +156,7 @@ Workbook.prototype = {
       title: this.title,
       subject: this.subject,
       keywords: this.keywords,
-      category:  this.category,
+      category: this.category,
       description: this.description,
       language: this.language,
       revision: this.revision,
diff --git a/lib/doc/worksheet.js b/lib/doc/worksheet.js
index 31a2e5b3a..6f737b1df 100644
--- a/lib/doc/worksheet.js
+++ b/lib/doc/worksheet.js
@@ -56,7 +56,7 @@ var Worksheet = module.exports = function(options) {
   
   // for all things printing
   this.pageSetup = Object.assign({}, {
-    margins: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer:  0.3 },
+    margins: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer: 0.3 },
     orientation: 'portrait',
     horizontalDpi: 4294967295,
     verticalDpi: 4294967295,
@@ -129,12 +129,12 @@ Worksheet.prototype = {
     var self = this;
 
     // calculate max header row count
-    this._headerRowCount = value.reduce(function(pv,cv) {
+    this._headerRowCount = value.reduce(function(pv, cv) {
       var headerCount =
         (cv.header && 1) ||
         (cv.headers && cv.headers.length) ||
         0;
-      return Math.max(pv, headerCount)
+      return Math.max(pv, headerCount);
     }, 0);
 
     // construct Column objects
@@ -196,7 +196,7 @@ Worksheet.prototype = {
     var nEnd = this._columns.length;
     if (nExpand < 0) {
       for (i = nKeep; i <= nEnd; i++) {
-        this.getColumn(i + nExpand).defn = this.getColumn(i).defn
+        this.getColumn(i + nExpand).defn = this.getColumn(i).defn;
       }
       for (i = nEnd + nExpand + 1; i <= nEnd; i++) {
         this.getColumn(i).defn = null;
@@ -401,7 +401,7 @@ Worksheet.prototype = {
       for (var j = dimensions.left; j <= dimensions.right; j++) {
         // merge all but the master cell
         if ((i > dimensions.top) || (j > dimensions.left)) {
-          this.getCell(i,j).merge(master);
+          this.getCell(i, j).merge(master);
         }
       }
     }
@@ -415,7 +415,7 @@ Worksheet.prototype = {
     if (merge) {
       for (var i = merge.top; i <= merge.bottom; i++) {
         for (var j = merge.left; j <= merge.right; j++) {
-          this.getCell(i,j).unmerge();
+          this.getCell(i, j).unmerge();
         }
       }
       delete this._merges[master.address];
@@ -438,7 +438,7 @@ Worksheet.prototype = {
     // find any cells in that range and unmerge them
     for (var i = dimensions.top; i <= dimensions.bottom; i++) {
       for (var j = dimensions.left; j <= dimensions.right; j++) {
-        var cell = this.findCell(i,j);
+        var cell = this.findCell(i, j);
         if (cell) {
           if (cell.type === Enums.ValueType.Merge) {
             // this cell merges to another master
@@ -478,13 +478,13 @@ Worksheet.prototype = {
     for (var r = top; r <= bottom; r++) {
       for (var c = left; c <= right; c++) {
         if (first) {
-          this.getCell(r,c).value = {
+          this.getCell(r, c).value = {
             formula,
             result: getResult(r, c),
           };
           first = false;
         } else {
-          this.getCell(r,c).value = {
+          this.getCell(r, c).value = {
             sharedFormula: masterAddress,
             result: getResult(r, c),
           };
@@ -496,7 +496,7 @@ Worksheet.prototype = {
 
   // =========================================================================
   // Images
-  addImage:  function addImageToCells(imageId, range) {
+  addImage: function addImageToCells(imageId, range) {
     this._media.push({
       type: 'image',
       imageId,
diff --git a/lib/stream/xlsx/workbook-reader.js b/lib/stream/xlsx/workbook-reader.js
index 4477b17cb..7bfb5acf5 100644
--- a/lib/stream/xlsx/workbook-reader.js
+++ b/lib/stream/xlsx/workbook-reader.js
@@ -70,9 +70,9 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
     var stream = this.stream = this._getStream(input);
     var zip = this.zip = unzip.Parse();
 
-    zip.on('entry',function (entry) {
+    zip.on('entry', function(entry) {
       var match, sheetNo;
-      switch(entry.path) {
+      switch (entry.path) {
         case '_rels/.rels':
         case 'xl/workbook.xml':
         case 'xl/_rels/workbook.xml.rels':
@@ -85,12 +85,12 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
           self._parseStyles(entry, options);
           break;
         default:
-          if (entry.path.match(/xl\/worksheets\/sheet\d+\.xml/)) {
-            match = entry.path.match(/xl\/worksheets\/sheet(\d+)\.xml/);
+          if (entry.path.match(/xl\/worksheets\/sheet\d+[.]xml/)) {
+            match = entry.path.match(/xl\/worksheets\/sheet(\d+)[.]xml/);
             sheetNo = match[1];
             self._parseWorksheet(entry, sheetNo, options);
-          } else if (entry.path.match(/xl\/worksheets\/_rels\/sheet\d+\.xml.rels/)) {
-            match = entry.path.match(/xl\/worksheets\/_rels\/sheet(\d+)\.xml.rels/);
+          } else if (entry.path.match(/xl\/worksheets\/_rels\/sheet\d+[.]xml.rels/)) {
+            match = entry.path.match(/xl\/worksheets\/_rels\/sheet(\d+)[.]xml.rels/);
             sheetNo = match[1];
             self._parseHyperlinks(entry, sheetNo, options);
           } else {
@@ -100,7 +100,7 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
       }
     });
 
-    zip.on('close', function () {
+    zip.on('close', function() {
       self.emit('end');
       self.atEnd = true;
       if (!self.readers) {
@@ -121,7 +121,7 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
     this._emitEntry(options, {type: 'shared-strings'});
     var self = this;
     var sharedStrings = null;
-    switch(options.sharedStrings) {
+    switch (options.sharedStrings) {
       case 'cache':
         sharedStrings = this.sharedStrings = [];
         break;
@@ -142,7 +142,7 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
         inT = true;
       }
     });
-    parser.on('closetag', function (name) {
+    parser.on('closetag', function(name) {
       if (inT && (name === 't')) {
         if (sharedStrings) {
           sharedStrings.push(t);
@@ -152,10 +152,10 @@ utils.inherits(WorkbookReader, events.EventEmitter, {
         t = null;
       }
     });
-    parser.on('text', function (text) {
+    parser.on('text', function(text) {
       t = t ? t + text : text;
     });
-    parser.on('error', function (error) {
+    parser.on('error', function(error) {
       self.emit('error', error);
     });
     entry.pipe(parser);
diff --git a/lib/stream/xlsx/workbook-writer.js b/lib/stream/xlsx/workbook-writer.js
index 775e12878..db920c8bc 100644
--- a/lib/stream/xlsx/workbook-writer.js
+++ b/lib/stream/xlsx/workbook-writer.js
@@ -257,7 +257,7 @@ WorkbookWriter.prototype = {
         {Id: 'rId' + (count++), Type: RelType.SharedStrings, Target: 'sharedStrings.xml'}
       );
     }
-    this._worksheets.forEach(function (worksheet) {
+    this._worksheets.forEach(function(worksheet) {
       if (worksheet) {
         worksheet.rId = 'rId' + (count++);
         relationships.push(
diff --git a/lib/stream/xlsx/worksheet-reader.js b/lib/stream/xlsx/worksheet-reader.js
index d9cdd4ba9..ed5366a42 100644
--- a/lib/stream/xlsx/worksheet-reader.js
+++ b/lib/stream/xlsx/worksheet-reader.js
@@ -98,7 +98,7 @@ utils.inherits(WorksheetReader, events.EventEmitter, {
       default:
         break;
     }
-    switch(options.hyperlinks) {
+    switch (options.hyperlinks) {
       case 'emit':
         emitHyperlinks = true;
         break;
@@ -218,7 +218,7 @@ utils.inherits(WorksheetReader, events.EventEmitter, {
     });
 
     // only text data is for sheet values
-    parser.on('text', function (text) {
+    parser.on('text', function(text) {
       if (emitSheet) {
         if (current) {
           current.text += text;
@@ -264,7 +264,7 @@ utils.inherits(WorksheetReader, events.EventEmitter, {
                 }
                 cell.value = value;
               } else if (c.v) {
-                switch(c.t) {
+                switch (c.t) {
                   case 's':
                     var index = parseInt(c.v.text, 10);
                     if (sharedStrings) {
@@ -304,7 +304,7 @@ utils.inherits(WorksheetReader, events.EventEmitter, {
         }
       }
     });
-    parser.on('error', function (error) {
+    parser.on('error', function(error) {
       self.emit('error', error);
     });
     parser.on('end', function() {
diff --git a/lib/stream/xlsx/worksheet-writer.js b/lib/stream/xlsx/worksheet-writer.js
index e1ca5f86b..2875b405b 100644
--- a/lib/stream/xlsx/worksheet-writer.js
+++ b/lib/stream/xlsx/worksheet-writer.js
@@ -107,7 +107,7 @@ var WorksheetWriter = module.exports = function(options) {
 
   // for all things printing
   this.pageSetup = Object.assign({}, {
-    margins: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer:  0.3 },
+    margins: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer: 0.3 },
     orientation: 'portrait',
     horizontalDpi: 4294967295,
     verticalDpi: 4294967295,
@@ -244,12 +244,12 @@ WorksheetWriter.prototype = {
     var self = this;
 
     // calculate max header row count
-    this._headerRowCount = value.reduce(function(pv,cv) {
+    this._headerRowCount = value.reduce(function(pv, cv) {
       var headerCount =
         (cv.header && 1) ||
         (cv.headers && cv.headers.length) ||
         0;
-      return Math.max(pv, headerCount)
+      return Math.max(pv, headerCount);
     }, 0);
 
     // construct Column objects
@@ -391,7 +391,7 @@ WorksheetWriter.prototype = {
     for (var i = dimensions.top; i <= dimensions.bottom; i++) {
       for (var j = dimensions.left; j <= dimensions.right; j++) {
         if ((i > dimensions.top) || (j > dimensions.left)) {
-          this.getCell(i,j).merge(master);
+          this.getCell(i, j).merge(master);
         }
       }
     }
diff --git a/lib/utils/cell-matrix.js b/lib/utils/cell-matrix.js
index f08be7345..570d08ec3 100644
--- a/lib/utils/cell-matrix.js
+++ b/lib/utils/cell-matrix.js
@@ -73,9 +73,9 @@ CellMatrix.prototype = {
   forEach: function(callback) {
     _.each(this.sheets, function(sheet) {
       if (sheet) {
-        sheet.forEach(function (row) {
+        sheet.forEach(function(row) {
           if (row) {
-            row.forEach(function (cell) {
+            row.forEach(function(cell) {
               if (cell) {
                 callback(cell);
               }
@@ -99,6 +99,7 @@ CellMatrix.prototype = {
     if (create) {
       return (this.sheets[name] = []);
     }
+    return undefined;
   },
   findSheetRow: function(sheet, address, create) {
     var row = address.row;
@@ -108,6 +109,7 @@ CellMatrix.prototype = {
     if (create) {
       return (sheet[row] = []);
     }
+    return undefined;
   },
   findRowCell: function(row, address, create) {
     var col = address.col;
@@ -117,6 +119,7 @@ CellMatrix.prototype = {
     if (create) {
       return (row[col] = this.template ? Object.assign(address, JSON.parse(JSON.stringify(this.template))) : address);
     }
+    return undefined;
   }
 };
 
diff --git a/lib/utils/col-cache.js b/lib/utils/col-cache.js
index f220e5954..9ab737c1f 100644
--- a/lib/utils/col-cache.js
+++ b/lib/utils/col-cache.js
@@ -9,7 +9,7 @@
 // =========================================================================
 // Column Letter to Number conversion
 var colCache = module.exports = {
-  _dictionary: ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
+  _dictionary: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'],
   _l2n: {},
   _n2l: [],
   _level: function(n) {
@@ -115,7 +115,7 @@ var colCache = module.exports = {
   },
 
   // convert r,c into structure (if only 1 arg, assume r is address string)
-  getAddress: function(r,c) {
+  getAddress: function(r, c) {
     if (c) {
       var address = this.n2l(c) + r;
       return this.decodeAddress(address);
@@ -164,7 +164,10 @@ var colCache = module.exports = {
       br = this.n2l(right) + bottom;
 
       return {
-        top: top, left: left, bottom: bottom, right: right,
+        top: top,
+        left: left,
+        bottom: bottom,
+        right: right,
         sheetName: sheetName,
         tl: { address: tl, col: left, row: top, $col$row: '$' + this.n2l(left) + '$' + top, sheetName: sheetName },
         br: { address: br, col: right, row: bottom, $col$row: '$' + this.n2l(right) + '$' + bottom, sheetName: sheetName },
@@ -185,7 +188,7 @@ var colCache = module.exports = {
 
   // convert row,col into string address or t,l,b,r into range
   encode: function() {
-    switch(arguments.length) {
+    switch (arguments.length) {
       case 2:
         return colCache.encodeAddress(arguments[0], arguments[1]);
       case 4:
diff --git a/lib/utils/flow-control.js b/lib/utils/flow-control.js
index d5df42eaf..1a8608d8a 100644
--- a/lib/utils/flow-control.js
+++ b/lib/utils/flow-control.js
@@ -109,8 +109,7 @@ utils.inherits(FlowControl, events.EventEmitter, {
       .then(function() {
         try {
           chunk.callback();
-        }
-        catch (e) {
+        } catch (e) {
           // quietly ignore
         }
       });
diff --git a/lib/utils/shared-formula.js b/lib/utils/shared-formula.js
index a82c7700b..4d80b5520 100644
--- a/lib/utils/shared-formula.js
+++ b/lib/utils/shared-formula.js
@@ -8,9 +8,9 @@
 
 var colCache = require('./col-cache');
 
-var cellRefRegex = /(([a-z_\-0-9]*)!)?\$?([a-z]+)\$?([1-9][0-9]*)/i;
-var replacementCandidateRx = /(([a-z_\-0-9]*)!)?([a-z0-9_$]{2,})(\()?/ig;
-var CRrx = /^(\$)?([a-z]+)(\$)?([1-9][0-9]*)$/i;
+var cellRefRegex = /(([a-z_\-0-9]*)!)?[$]?([a-z]+)[$]?([1-9][0-9]*)/i;
+var replacementCandidateRx = /(([a-z_\-0-9]*)!)?([a-z0-9_$]{2,})([(])?/ig;
+var CRrx = /^([$])?([a-z]+)([$])?([1-9][0-9]*)$/i;
 
 var slideFormula = function(formula, fromCell, toCell) {
   var offset = colCache.decode(fromCell);
@@ -19,7 +19,7 @@ var slideFormula = function(formula, fromCell, toCell) {
     if (trailingParen) {
       return refMatch;
     }
-    var match = CRrx.exec(addrPart)
+    var match = CRrx.exec(addrPart);
     if (match) {
       var colDollar = match[1];
       var colStr = match[2].toUpperCase();
@@ -42,7 +42,7 @@ var slideFormula = function(formula, fromCell, toCell) {
     }
     return refMatch;
   });
-}
+};
 
 module.exports = {
   slideFormula
diff --git a/lib/utils/shared-strings.js b/lib/utils/shared-strings.js
index f33956430..782896a3f 100644
--- a/lib/utils/shared-strings.js
+++ b/lib/utils/shared-strings.js
@@ -9,7 +9,7 @@
 var SharedStrings = module.exports = function() {
   this._values = [];
   this._totalRefs = 0;
-  this._hash = {}
+  this._hash = {};
 };
 
 SharedStrings.prototype = {
diff --git a/lib/utils/stream-buf.js b/lib/utils/stream-buf.js
index b594a3f25..0b155381b 100644
--- a/lib/utils/stream-buf.js
+++ b/lib/utils/stream-buf.js
@@ -159,7 +159,7 @@ var StreamBuf = module.exports = function(options) {
 utils.inherits(StreamBuf, Stream.Duplex, {
 
   toBuffer: function() {
-    switch(this.buffers.length) {
+    switch (this.buffers.length) {
       case 0:
         return null;
       case 1:
diff --git a/lib/utils/under-dash.js b/lib/utils/under-dash.js
index c5d83f92f..e8383a2ab 100644
--- a/lib/utils/under-dash.js
+++ b/lib/utils/under-dash.js
@@ -6,7 +6,7 @@ var _ = {
       if (Array.isArray(obj)) {
         obj.forEach(cb);
       } else {
-        Object.keys(obj).forEach(function (key) {
+        Object.keys(obj).forEach(function(key) {
           cb(obj[key], key);
         });
       }
@@ -18,10 +18,11 @@ var _ = {
       if (Array.isArray(obj)) {
         return obj.some(cb);
       }
-      return Object.keys(obj).some(function (key) {
+      return Object.keys(obj).some(function(key) {
         return cb(obj[key], key);
       });
     }
+    return false;
   },
 
   every: function every(obj, cb) {
@@ -29,7 +30,7 @@ var _ = {
       if (Array.isArray(obj)) {
         return obj.every(cb);
       }
-      return Object.keys(obj).every(function (key) {
+      return Object.keys(obj).every(function(key) {
         return cb(obj[key], key);
       });
     }
@@ -41,14 +42,14 @@ var _ = {
       if (Array.isArray(obj)) {
         return obj.map(cb);
       }
-      return Object.keys(obj).map(function (key) {
+      return Object.keys(obj).map(function(key) {
         return cb(obj[key], key);
       });
     }
     return [];
   },
 
-  isEqual: function isEqual(a,b) {
+  isEqual: function isEqual(a, b) {
     var aType = typeof a;
     var bType = typeof b;
     var aArray = Array.isArray(a);
@@ -57,7 +58,7 @@ var _ = {
     if (aType !== bType) {
       return false;
     }
-    switch(typeof a) {
+    switch (typeof a) {
       case 'object':
         if (aArray || bArray) {
           if (aArray && bArray) {
diff --git a/lib/utils/utils.js b/lib/utils/utils.js
index 52b5bd5c4..6722bc3b1 100644
--- a/lib/utils/utils.js
+++ b/lib/utils/utils.js
@@ -11,7 +11,6 @@ var PromishLib = require('./promish');
 
 // useful stuff
 var inherits = function(cls, superCtor, statics, prototype) {
-  var i;
   cls.super_ = superCtor;
 
   if (!prototype) {
@@ -34,11 +33,9 @@ var inherits = function(cls, superCtor, statics, prototype) {
     }
   };
   if (prototype) {
-    for (i in prototype) {
-      if (prototype.hasOwnProperty(i)) {
-        properties[i] = Object.getOwnPropertyDescriptor(prototype, i);
-      }
-    }
+    Object.keys(prototype).forEach(i => {
+      properties[i] = Object.getOwnPropertyDescriptor(prototype, i);
+    });
   }
 
   cls.prototype = Object.create(superCtor.prototype, properties);
@@ -57,7 +54,7 @@ var utils = module.exports = {
         // poorman's setImmediate - must wait at least 1ms
         setTimeout(function() {
           resolve(value);
-        },1);
+        }, 1);
       }
     });
   },
@@ -81,7 +78,7 @@ var utils = module.exports = {
   },
   xmlEncode: function(text) {
     // eslint-disable-next-line no-control-regex
-    return text.replace(/[<>&'"\x7F\x00-\x08\x0A-\x0C\x0E-\x1F]/g, function (c) {
+    return text.replace(/[<>&'"\x7F\x00-\x08\x0A-\x0C\x0E-\x1F]/g, function(c) {
       switch (c) {
         case '<': return '&lt;';
         case '>': return '&gt;';
@@ -113,8 +110,8 @@ var utils = module.exports = {
     if (!fmt) { return false; }
 
     // must remove all chars inside quotes and []
-    fmt = fmt.replace(/\[[^\]]*]/g,'');
-    fmt = fmt.replace(/"[^"]*"/g,'');
+    fmt = fmt.replace(/\[[^\]]*]/g, '');
+    fmt = fmt.replace(/"[^"]*"/g, '');
     // then check for date formatting chars
     var result = fmt.match(/[ymdhMsb]+/) !== null;
     return result;
@@ -131,7 +128,7 @@ var utils = module.exports = {
   },
   
   toIsoDateString: function(dt) {
-    return dt.toIsoString().subsstr(0,10);
+    return dt.toIsoString().subsstr(0, 10);
   }
 };
 
diff --git a/lib/xlsx/defaultnumformats.js b/lib/xlsx/defaultnumformats.js
index b768e3412..629b61b37 100644
--- a/lib/xlsx/defaultnumformats.js
+++ b/lib/xlsx/defaultnumformats.js
@@ -7,25 +7,25 @@
 'use strict';
 
 module.exports = {
-  0:  { 'f': 'General' },
-  1:  { 'f': '0' },
-  2:  { 'f': '0.00' },
-  3:  { 'f': '#,##0' },
-  4:  { 'f': '#,##0.00' },
-  9:  { 'f': '0%' },
-  10: { 'f': '0.00%' },
-  11: { 'f': '0.00E+00' },
-  12: { 'f': '# ?/?'},
-  13: { 'f': '# ??/??'},
-  14: { 'f': 'mm-dd-yy'},
-  15: { 'f': 'd-mmm-yy'},
-  16: { 'f': 'd-mmm'},
-  17: { 'f': 'mmm-yy'},
-  18: { 'f': 'h:mm AM/PM'},
-  19: { 'f': 'h:mm:ss AM/PM'},
-  20: { 'f': 'h:mm'},
-  21: { 'f': 'h:mm:ss'},
-  22: { 'f': 'm/d/yy "h":mm'},
+  0: { f: 'General' },
+  1: { f: '0' },
+  2: { f: '0.00' },
+  3: { f: '#,##0' },
+  4: { f: '#,##0.00' },
+  9: { f: '0%' },
+  10: { f: '0.00%' },
+  11: { f: '0.00E+00' },
+  12: { f: '# ?/?'},
+  13: { f: '# ??/??'},
+  14: { f: 'mm-dd-yy'},
+  15: { f: 'd-mmm-yy'},
+  16: { f: 'd-mmm'},
+  17: { f: 'mmm-yy'},
+  18: { f: 'h:mm AM/PM'},
+  19: { f: 'h:mm:ss AM/PM'},
+  20: { f: 'h:mm'},
+  21: { f: 'h:mm:ss'},
+  22: { f: 'm/d/yy "h":mm'},
 
   27: { 'zh-tw': '[$-404]e/m/d', 'zh-cn': 'yyyy"年"m"月"', 'ja-jp': '[$-411]ge.m.d', 'ko-kr': 'yyyy"年" mm"月" dd"日"' },
   28: { 'zh-tw': '[$-404]e"年"m"月"d"日"', 'zh-cn': 'm"月"d"日"', 'ja-jp': '[$-411]ggge"年"m"月"d"日"', 'ko-kr': 'mm-dd' },
@@ -38,15 +38,15 @@ module.exports = {
   35: { 'zh-tw': '上午/下午 hh"時"mm"分"ss"秒"', 'zh-cn': '上午/下午 h"时"mm"分"ss"秒"', 'ja-jp': 'm"月"d"日"', 'ko-kr': 'yyyy-mm-dd' },
   36: { 'zh-tw': '[$-404]e/m/d', 'zh-cn': 'yyyy"年"m"月"', 'ja-jp': '[$-411]ge.m.d', 'ko-kr': 'yyyy"年" mm"月" dd"日"' },
 
-  37: { 'f': '#,##0 ;(#,##0)'},
-  38: { 'f': '#,##0 ;[Red](#,##0)'},
-  39: { 'f': '#,##0.00 ;(#,##0.00)'},
-  40: { 'f': '#,##0.00 ;[Red](#,##0.00)'},
-  45: { 'f': 'mm:ss'},
-  46: { 'f': '[h]:mm:ss'},
-  47: { 'f': 'mmss.0'},
-  48: { 'f': '##0.0E+0'},
-  49: { 'f': '@' },
+  37: { f: '#,##0 ;(#,##0)'},
+  38: { f: '#,##0 ;[Red](#,##0)'},
+  39: { f: '#,##0.00 ;(#,##0.00)'},
+  40: { f: '#,##0.00 ;[Red](#,##0.00)'},
+  45: { f: 'mm:ss'},
+  46: { f: '[h]:mm:ss'},
+  47: { f: 'mmss.0'},
+  48: { f: '##0.0E+0'},
+  49: { f: '@' },
 
   50: { 'zh-tw': '[$-404]e/m/d', 'zh-cn': 'yyyy"年"m"月"', 'ja-jp': '[$-411]ge.m.d', 'ko-kr': 'yyyy"年" mm"月" dd"日"' },
   51: { 'zh-tw': '[$-404]e"年"m"月"d"日"', 'zh-cn': 'm"月"d"日"', 'ja-jp': '[$-411]ggge"年"m"月"d"日"', 'ko-kr': 'mm-dd' },
diff --git a/lib/xlsx/xform/base-xform.js b/lib/xlsx/xform/base-xform.js
index 5b8e1623a..57c4feabf 100644
--- a/lib/xlsx/xform/base-xform.js
+++ b/lib/xlsx/xform/base-xform.js
@@ -18,13 +18,13 @@ var BaseXform = module.exports = function(model, name) {
 BaseXform.prototype = {
   // ============================================================
   // Virtual Interface
-  prepare:  function(model, options) {
+  prepare: function(model, options) {
     // optional preparation (mutation) of model so it is ready for write
   },
   render: function(xmlStream, model) {
     // convert model to xml
   },
-  parseOpen:  function(node) {
+  parseOpen: function(node) {
     // Sax Open Node event
   },
   parseText: function(node) {
diff --git a/lib/xlsx/xform/book/defined-name-xform.js b/lib/xlsx/xform/book/defined-name-xform.js
index 561575e9a..f89cc42ea 100644
--- a/lib/xlsx/xform/book/defined-name-xform.js
+++ b/lib/xlsx/xform/book/defined-name-xform.js
@@ -26,7 +26,7 @@ utils.inherits(DefinedNamesXform, BaseXform, {
     xmlStream.closeNode();
   },
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case 'definedName':
         this._parsedName = node.attributes.name;
         this._parsedLocalSheetId = node.attributes.localSheetId;
@@ -55,8 +55,8 @@ function extractRanges(parsedText) {
  var ranges = [];
  var quotesOpened = false;
  var last = '';
- parsedText.split(',').forEach(function (item) {
-     if(!item) {
+ parsedText.split(',').forEach(function(item) {
+     if (!item) {
        return;
      }
      var quotes = (item.match(/'/g) || []).length;
diff --git a/lib/xlsx/xform/book/workbook-xform.js b/lib/xlsx/xform/book/workbook-xform.js
index b23e66226..35e922a87 100644
--- a/lib/xlsx/xform/book/workbook-xform.js
+++ b/lib/xlsx/xform/book/workbook-xform.js
@@ -43,7 +43,7 @@ utils.inherits(WorkbookXform, BaseXform, {
     fileVersion: new StaticXform({tag: 'fileVersion', $: {appName: 'xl', lastEdited: 5, lowestEdited: 5, rupBuild: 9303}}),
     calcPr: new StaticXform({tag: 'calcPr', $: {calcId: 171027}})
   }
-},{
+}, {
 
   prepare: function(model) {
     model.sheets = model.worksheets;
@@ -91,7 +91,7 @@ utils.inherits(WorkbookXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'workbook':
         return true;
       default:
@@ -114,7 +114,7 @@ utils.inherits(WorkbookXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case 'workbook':
         this.model = {
           sheets: this.map.sheets.model,
@@ -173,6 +173,6 @@ utils.inherits(WorkbookXform, BaseXform, {
     // used by sheets to build their image models
     model.media.forEach((media, i) => {
       media.index = i;
-    })
+    });
   }
 });
diff --git a/lib/xlsx/xform/composite-xform.js b/lib/xlsx/xform/composite-xform.js
index f68961555..dc1997ecb 100644
--- a/lib/xlsx/xform/composite-xform.js
+++ b/lib/xlsx/xform/composite-xform.js
@@ -25,14 +25,14 @@ var CompositeXform = module.exports = function(options) {
 
 utils.inherits(CompositeXform, BaseXform, {
   prepare: function(model, options) {
-    this.children.forEach(function (child) {
+    this.children.forEach(function(child) {
       child.xform.prepare(model[child.tag], options);
     });
   },
   
   render: function(xmlStream, model) {
     xmlStream.openNode(this.tag, this.attrs);
-    this.children.forEach(function (child) {
+    this.children.forEach(function(child) {
       child.xform.render(xmlStream, model[child.name]);
     });
     xmlStream.closeNode();
@@ -43,7 +43,7 @@ utils.inherits(CompositeXform, BaseXform, {
       this.parser.xform.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case this.tag:
         this.model = {};
         return true;
@@ -72,7 +72,7 @@ utils.inherits(CompositeXform, BaseXform, {
     return false;
   },
   reconcile: function(model, options) {
-    this.children.forEach(function (child) {
+    this.children.forEach(function(child) {
       child.xform.prepare(model[child.tag], options);
     });
   }
diff --git a/lib/xlsx/xform/core/app-xform.js b/lib/xlsx/xform/core/app-xform.js
index 2cfdf1b7e..10242d87b 100644
--- a/lib/xlsx/xform/core/app-xform.js
+++ b/lib/xlsx/xform/core/app-xform.js
@@ -26,11 +26,11 @@ var AppXform = module.exports = function() {
     'Manager': new StringXform({tag: 'Manager'}),
     'HeadingPairs': new AppHeadingPairsXform(),
     'TitleOfParts': new AppTitleOfPartsXform()
-  }
+  };
 };
 
 AppXform.DateFormat = function(dt) {
-  return dt.toISOString().replace(/\.\d{3}/,'');
+  return dt.toISOString().replace(/[.]\d{3,6}/, '');
 };
 AppXform.DateAttrs = {'xsi:type': 'dcterms:W3CDTF'};
 
@@ -67,7 +67,7 @@ utils.inherits(AppXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'Properties':
         return true;
       default:
@@ -93,7 +93,7 @@ utils.inherits(AppXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case 'Properties':
         this.model = {
           worksheets: this.map['TitleOfParts'].model,
diff --git a/lib/xlsx/xform/core/content-types-xform.js b/lib/xlsx/xform/core/content-types-xform.js
index d66df7cb6..2029d92c2 100644
--- a/lib/xlsx/xform/core/content-types-xform.js
+++ b/lib/xlsx/xform/core/content-types-xform.js
@@ -21,7 +21,7 @@ utils.inherits(ContentTypesXform, BaseXform, {
   PROPERTY_ATTRIBUTES: {
     xmlns: 'http://schemas.openxmlformats.org/package/2006/content-types'
   }
-},{
+}, {
 
   render: function(xmlStream, model) {
     xmlStream.openXml(XmlStream.StdDocAttributes);
@@ -39,31 +39,31 @@ utils.inherits(ContentTypesXform, BaseXform, {
       }
     });
 
-    xmlStream.leafNode('Default', {Extension:'rels', ContentType: 'application/vnd.openxmlformats-package.relationships+xml'});
-    xmlStream.leafNode('Default', {Extension:'xml', ContentType: 'application/xml'});
+    xmlStream.leafNode('Default', {Extension: 'rels', ContentType: 'application/vnd.openxmlformats-package.relationships+xml'});
+    xmlStream.leafNode('Default', {Extension: 'xml', ContentType: 'application/xml'});
 
-    xmlStream.leafNode('Override', {PartName:'/xl/workbook.xml', ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'});
+    xmlStream.leafNode('Override', {PartName: '/xl/workbook.xml', ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'});
 
     model.worksheets.forEach(function(worksheet) {
       var name = '/xl/worksheets/sheet' + worksheet.id + '.xml';
-      xmlStream.leafNode('Override', {PartName:name, ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'});
+      xmlStream.leafNode('Override', {PartName: name, ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'});
     });
 
-    xmlStream.leafNode('Override', {PartName:'/xl/theme/theme1.xml',
+    xmlStream.leafNode('Override', {PartName: '/xl/theme/theme1.xml',
       ContentType: 'application/vnd.openxmlformats-officedocument.theme+xml'});
-    xmlStream.leafNode('Override', {PartName:'/xl/styles.xml',
+    xmlStream.leafNode('Override', {PartName: '/xl/styles.xml',
       ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'});
-    xmlStream.leafNode('Override', {PartName:'/xl/sharedStrings.xml',
+    xmlStream.leafNode('Override', {PartName: '/xl/sharedStrings.xml',
       ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'});
 
     model.drawings && model.drawings.forEach(function(drawing) {
-      xmlStream.leafNode('Override', {PartName:'/xl/drawings/' + drawing.name + '.xml',
+      xmlStream.leafNode('Override', {PartName: '/xl/drawings/' + drawing.name + '.xml',
         ContentType: 'application/vnd.openxmlformats-officedocument.drawing+xml'});
     });
 
-    xmlStream.leafNode('Override', {PartName:'/docProps/core.xml',
+    xmlStream.leafNode('Override', {PartName: '/docProps/core.xml',
       ContentType: 'application/vnd.openxmlformats-package.core-properties+xml'});
-    xmlStream.leafNode('Override', {PartName:'/docProps/app.xml',
+    xmlStream.leafNode('Override', {PartName: '/docProps/app.xml',
       ContentType: 'application/vnd.openxmlformats-officedocument.extended-properties+xml'});
 
     xmlStream.closeNode();
diff --git a/lib/xlsx/xform/core/core-xform.js b/lib/xlsx/xform/core/core-xform.js
index 7f86018f3..2cbee85eb 100644
--- a/lib/xlsx/xform/core/core-xform.js
+++ b/lib/xlsx/xform/core/core-xform.js
@@ -28,11 +28,11 @@ var CoreXform = module.exports = function() {
     'cp:contentStatus': new StringXform({tag: 'cp:contentStatus'}),
     'dcterms:created': new DateXform({tag: 'dcterms:created', attrs: CoreXform.DateAttrs, format: CoreXform.DateFormat}),
     'dcterms:modified': new DateXform({tag: 'dcterms:modified', attrs: CoreXform.DateAttrs, format: CoreXform.DateFormat})
-  }
+  };
 };
 
 CoreXform.DateFormat = function(dt) {
-  return dt.toISOString().replace(/\.\d{3}/,'');
+  return dt.toISOString().replace(/[.]\d{3}/, '');
 };
 CoreXform.DateAttrs = {'xsi:type': 'dcterms:W3CDTF'};
 
@@ -73,7 +73,7 @@ utils.inherits(CoreXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'cp:coreProperties':
         return true;
       default:
@@ -97,7 +97,7 @@ utils.inherits(CoreXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case 'cp:coreProperties':
         this.model = {
           creator: this.map['dc:creator'].model,
diff --git a/lib/xlsx/xform/core/relationship-xform.js b/lib/xlsx/xform/core/relationship-xform.js
index 21731134f..4c9ce9a37 100644
--- a/lib/xlsx/xform/core/relationship-xform.js
+++ b/lib/xlsx/xform/core/relationship-xform.js
@@ -18,7 +18,7 @@ utils.inherits(RelationshipXform, BaseXform, {
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case 'Relationship':
         this.model = node.attributes;
         return true;
diff --git a/lib/xlsx/xform/core/relationships-xform.js b/lib/xlsx/xform/core/relationships-xform.js
index 93023f2c2..858beeec1 100644
--- a/lib/xlsx/xform/core/relationships-xform.js
+++ b/lib/xlsx/xform/core/relationships-xform.js
@@ -15,12 +15,12 @@ var RelationshipXform = require('./relationship-xform');
 var RelationshipsXform = module.exports = function() {
   this.map = {
     Relationship: new RelationshipXform()
-  }
+  };
 };
 
 utils.inherits(RelationshipsXform, BaseXform, {
-  RELATIONSHIPS_ATTRIBUTES: {xmlns:  'http://schemas.openxmlformats.org/package/2006/relationships'}
-},{
+  RELATIONSHIPS_ATTRIBUTES: {xmlns: 'http://schemas.openxmlformats.org/package/2006/relationships'}
+}, {
   render: function(xmlStream, model) {
     model = model || this._values;
     xmlStream.openXml(XmlStream.StdDocAttributes);
@@ -39,7 +39,7 @@ utils.inherits(RelationshipsXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'Relationships':
         this.model = [];
         return true;
@@ -65,7 +65,7 @@ utils.inherits(RelationshipsXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case 'Relationships':
         return false;
       default:
diff --git a/lib/xlsx/xform/drawing/blip-fill-xform.js b/lib/xlsx/xform/drawing/blip-fill-xform.js
index 21a8e25fe..3efe2cb0b 100644
--- a/lib/xlsx/xform/drawing/blip-fill-xform.js
+++ b/lib/xlsx/xform/drawing/blip-fill-xform.js
@@ -64,7 +64,7 @@ utils.inherits(BlipFillXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case this.tag:
         this.model = this.map['a:blip'].model;
         return false;
diff --git a/lib/xlsx/xform/drawing/blip-xform.js b/lib/xlsx/xform/drawing/blip-xform.js
index ea0fdfe56..c2f5613ff 100644
--- a/lib/xlsx/xform/drawing/blip-xform.js
+++ b/lib/xlsx/xform/drawing/blip-xform.js
@@ -43,7 +43,7 @@ utils.inherits(BlipXform, BaseXform, {
   },
 
   parseClose: function(name) {
-    switch(name) {
+    switch (name) {
       case this.tag:
         return false;
       default:
diff --git a/lib/xlsx/xform/drawing/cell-position-xform.js b/lib/xlsx/xform/drawing/cell-position-xform.js
index cd1725ba3..e8047ff99 100644
--- a/lib/xlsx/xform/drawing/cell-position-xform.js
+++ b/lib/xlsx/xform/drawing/cell-position-xform.js
@@ -70,7 +70,7 @@ utils.inherits(CellPositionXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case this.tag:
         this.model = {
           col: this.map['xdr:col'].model + (this.map['xdr:colOff'].model / 640000),
diff --git a/lib/xlsx/xform/drawing/drawing-xform.js b/lib/xlsx/xform/drawing/drawing-xform.js
index b1d5bf0f1..96149ffe8 100644
--- a/lib/xlsx/xform/drawing/drawing-xform.js
+++ b/lib/xlsx/xform/drawing/drawing-xform.js
@@ -16,7 +16,7 @@ var TwoCellAnchorXform = require('./two-cell-anchor-xform');
 
 var WorkSheetXform = module.exports = function() {
   this.map = {
-    'xdr:twoCellAnchor':  new TwoCellAnchorXform()
+    'xdr:twoCellAnchor': new TwoCellAnchorXform()
   };
 };
 
@@ -25,7 +25,7 @@ utils.inherits(WorkSheetXform, BaseXform, {
     'xmlns:xdr': 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing',
     'xmlns:a': 'http://schemas.openxmlformats.org/drawingml/2006/main'
   }
-},{
+}, {
   get tag() { return 'xdr:wsDr'; },
 
   prepare: function(model, options) {
@@ -83,7 +83,7 @@ utils.inherits(WorkSheetXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case this.tag:
         return false;
       default:
diff --git a/lib/xlsx/xform/drawing/pic-xform.js b/lib/xlsx/xform/drawing/pic-xform.js
index 162e819c9..652b9ccb0 100644
--- a/lib/xlsx/xform/drawing/pic-xform.js
+++ b/lib/xlsx/xform/drawing/pic-xform.js
@@ -70,7 +70,7 @@ utils.inherits(PicXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case this.tag:
         return false;
       default:
diff --git a/lib/xlsx/xform/drawing/sp-pr.js b/lib/xlsx/xform/drawing/sp-pr.js
index 9a892765e..5eaa766a9 100644
--- a/lib/xlsx/xform/drawing/sp-pr.js
+++ b/lib/xlsx/xform/drawing/sp-pr.js
@@ -16,4 +16,4 @@ module.exports = {
       ]
     }
   ]
-}
+};
diff --git a/lib/xlsx/xform/drawing/two-cell-anchor-xform.js b/lib/xlsx/xform/drawing/two-cell-anchor-xform.js
index d38fd671b..369530749 100644
--- a/lib/xlsx/xform/drawing/two-cell-anchor-xform.js
+++ b/lib/xlsx/xform/drawing/two-cell-anchor-xform.js
@@ -17,8 +17,8 @@ var PicXform = require('./pic-xform');
 
 var TwoCellAnchorXform = module.exports = function() {
   this.map = {
-    'xdr:from':  new CellPositionXform({tag: 'xdr:from'}),
-    'xdr:to':  new CellPositionXform({tag: 'xdr:to'}),
+    'xdr:from': new CellPositionXform({tag: 'xdr:from'}),
+    'xdr:to': new CellPositionXform({tag: 'xdr:to'}),
     'xdr:pic': new PicXform(),
     'xdr:clientData': new StaticXform({tag: 'xdr:clientData'}),
   };
@@ -42,7 +42,7 @@ utils.inherits(TwoCellAnchorXform, BaseXform, {
       model.br = {
         col: range.right,
         row: range.bottom
-      }
+      };
     } else {
       // API specifies zero based coords
       const { row, col } = model.range.tl;
@@ -94,13 +94,13 @@ utils.inherits(TwoCellAnchorXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case this.tag:
         this.model = {
           tl: this.map['xdr:from'].model,
           br: this.map['xdr:to'].model,
           picture: this.map['xdr:pic'].model,
-        }
+        };
         return false;
       default:
         // could be some unrecognised tags
@@ -110,7 +110,7 @@ utils.inherits(TwoCellAnchorXform, BaseXform, {
 
   reconcile: function(model, options) {
     var rel = options.rels[model.picture.rId];
-    var match = rel.Target.match(/.*\/media\/(.+\.[a-z]{3,4})/);
+    var match = rel.Target.match(/.*\/media\/(.+[.][a-z]{3,4})/);
     if (match) {
       var name = match[1];
       var mediaId = options.mediaIndex[name];
@@ -119,11 +119,10 @@ utils.inherits(TwoCellAnchorXform, BaseXform, {
     if (Number.isInteger(model.tl.row) && Number.isInteger(model.tl.col) && Number.isInteger(model.br.row) && Number.isInteger(model.br.col)) {
       model.range = colCache.encode(model.tl.row + 1, model.tl.col + 1, model.br.row, model.br.col);
     } else {
-      const { row, col } = model.tl;
       model.range = {
-        tl: { row: row + 1, col: col + 1 },
+        tl: model.tl,
         br: model.br,
-      }
+      };
     }
     delete model.tl;
     delete model.br;
diff --git a/lib/xlsx/xform/list-xform.js b/lib/xlsx/xform/list-xform.js
index be3d04e88..75e7735fe 100644
--- a/lib/xlsx/xform/list-xform.js
+++ b/lib/xlsx/xform/list-xform.js
@@ -22,7 +22,7 @@ utils.inherits(ListXform, BaseXform, {
   prepare: function(model, options) {
     var childXform = this.childXform;
     if (model) {
-      model.forEach(function (childModel) {
+      model.forEach(function(childModel) {
         childXform.prepare(childModel, options);
       });
     }
@@ -36,7 +36,7 @@ utils.inherits(ListXform, BaseXform, {
       }
 
       var childXform = this.childXform;
-      model.forEach(function (childModel) {
+      model.forEach(function(childModel) {
         childXform.render(xmlStream, childModel);
       });
 
@@ -51,7 +51,7 @@ utils.inherits(ListXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case this.tag:
         this.model = [];
         return true;
@@ -81,7 +81,7 @@ utils.inherits(ListXform, BaseXform, {
   reconcile: function(model, options) {
     if (model) {
       var childXform = this.childXform;
-      model.forEach(function (childModel) {
+      model.forEach(function(childModel) {
         childXform.reconcile(childModel, options);
       });
     }
diff --git a/lib/xlsx/xform/sheet/auto-filter-xform.js b/lib/xlsx/xform/sheet/auto-filter-xform.js
index 4e44e5883..ef70a855c 100644
--- a/lib/xlsx/xform/sheet/auto-filter-xform.js
+++ b/lib/xlsx/xform/sheet/auto-filter-xform.js
@@ -28,7 +28,7 @@ utils.inherits(AutoFilterXform, BaseXform, {
             return addr;
           }
           return colCache.getAddress(addr.row, addr.column).address;
-        }
+        };
 
         var firstAddress = getAddress(model.from);
         var secondAddress = getAddress(model.to);
diff --git a/lib/xlsx/xform/sheet/cell-xform.js b/lib/xlsx/xform/sheet/cell-xform.js
index 34ecfbf3a..280f0835e 100644
--- a/lib/xlsx/xform/sheet/cell-xform.js
+++ b/lib/xlsx/xform/sheet/cell-xform.js
@@ -101,7 +101,7 @@ utils.inherits(CellXform, BaseXform, {
             master.ref = new Range(master.address, model.address);
           }
         }
-        break
+        break;
       default:
         break;
     }
@@ -227,7 +227,7 @@ utils.inherits(CellXform, BaseXform, {
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case 'c':
         // var address = colCache.decodeAddress(node.attributes.r);
         var model = this.model = {
@@ -269,7 +269,7 @@ utils.inherits(CellXform, BaseXform, {
     }
   },
   parseClose: function(name) {
-    switch(name) {
+    switch (name) {
       case 'c':
         var model = this.model;
 
diff --git a/lib/xlsx/xform/sheet/data-validations-xform.js b/lib/xlsx/xform/sheet/data-validations-xform.js
index 82f65763d..d9cf38d48 100644
--- a/lib/xlsx/xform/sheet/data-validations-xform.js
+++ b/lib/xlsx/xform/sheet/data-validations-xform.js
@@ -19,7 +19,7 @@ function assign(definedName, attributes, name, defaultValue) {
   }
 }
 function parseBool(value) {
-  switch(value) {
+  switch (value) {
     case '1':
     case 'true':
       return true;
@@ -48,7 +48,7 @@ utils.inherits(DataValidationsXform, BaseXform, {
     if (count) {
       xmlStream.openNode('dataValidations', {count: count});
 
-      _.each(model, function (value, address) {
+      _.each(model, function(value, address) {
         xmlStream.openNode('dataValidation');
         if (value.type !== 'any') {
           xmlStream.addAttribute('type', value.type);
@@ -82,7 +82,7 @@ utils.inherits(DataValidationsXform, BaseXform, {
           xmlStream.addAttribute('error', value.error);
         }
         xmlStream.addAttribute('sqref', address);
-        (value.formulae || []).forEach(function (formula, index) {
+        (value.formulae || []).forEach(function(formula, index) {
           xmlStream.openNode('formula' + (index + 1));
           if (value.type === 'date') {
             xmlStream.writeText(utils.dateToExcel(formula));
@@ -97,7 +97,7 @@ utils.inherits(DataValidationsXform, BaseXform, {
     }
   },
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case 'dataValidations':
         this.model = {};
         return true;
@@ -145,7 +145,7 @@ utils.inherits(DataValidationsXform, BaseXform, {
     this._formula.push(text);
   },
   parseClose: function(name) {
-    switch(name) {
+    switch (name) {
       case 'dataValidations':
         return false;
       case 'dataValidation':
diff --git a/lib/xlsx/xform/sheet/drawing-xform.js b/lib/xlsx/xform/sheet/drawing-xform.js
index 10950eab3..4c6b2e5da 100644
--- a/lib/xlsx/xform/sheet/drawing-xform.js
+++ b/lib/xlsx/xform/sheet/drawing-xform.js
@@ -18,12 +18,12 @@ utils.inherits(DrawingXform, BaseXform, {
 
   render: function(xmlStream, model) {
     if (model) {
-      xmlStream.leafNode(this.tag, {'r:id': model.rId})
+      xmlStream.leafNode(this.tag, {'r:id': model.rId});
     }
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case this.tag:
         this.model = {
           rId: node.attributes['r:id']
diff --git a/lib/xlsx/xform/sheet/hyperlink-xform.js b/lib/xlsx/xform/sheet/hyperlink-xform.js
index 895f74e5b..7ba81861b 100644
--- a/lib/xlsx/xform/sheet/hyperlink-xform.js
+++ b/lib/xlsx/xform/sheet/hyperlink-xform.js
@@ -27,7 +27,7 @@ utils.inherits(HyperlinkXform, BaseXform, {
     if (node.name === 'hyperlink') {
       this.model = {
         address: node.attributes.ref,
-        rId:  node.attributes['r:id']
+        rId: node.attributes['r:id']
       };
       return true;
     }
diff --git a/lib/xlsx/xform/sheet/merges.js b/lib/xlsx/xform/sheet/merges.js
index b438b20cf..e987ad489 100644
--- a/lib/xlsx/xform/sheet/merges.js
+++ b/lib/xlsx/xform/sheet/merges.js
@@ -18,7 +18,7 @@ var Merges = module.exports = function() {
 };
 
 Merges.prototype = {
-  add:  function(merge) {
+  add: function(merge) {
     // merge is {address, master}
     if (this.merges[merge.master]) {
       this.merges[merge.master].expandToAddress(merge.address);
@@ -34,7 +34,7 @@ Merges.prototype = {
   },
   reconcile: function(mergeCells, rows) {
     // reconcile merge list with merge cells
-    _.each(mergeCells, function (merge) {
+    _.each(mergeCells, function(merge) {
       var dimensions = colCache.decode(merge);
       for (var i = dimensions.top; i <= dimensions.bottom; i++) {
         var row = rows[i - 1];
@@ -53,11 +53,9 @@ Merges.prototype = {
       }
     });
   },
-  getMasterAddress:  function(address) {
+  getMasterAddress: function(address) {
     // if address has been merged, return its master's address. Assumes reconcile has been called
     var range = this.hash[address];
-    if (range) {
-      return range.tl;
-    }
+    return range && range.tl;
   }
 };
\ No newline at end of file
diff --git a/lib/xlsx/xform/sheet/page-margins-xform.js b/lib/xlsx/xform/sheet/page-margins-xform.js
index f589ade39..0b5da6353 100644
--- a/lib/xlsx/xform/sheet/page-margins-xform.js
+++ b/lib/xlsx/xform/sheet/page-margins-xform.js
@@ -27,14 +27,14 @@ utils.inherits(PageMarginsXform, BaseXform, {
         header: model.header,
         footer: model.footer
       };
-      if (_.some(attributes, function(value) { return value !== undefined})) {
+      if (_.some(attributes, function(value) { return value !== undefined; })) {
         xmlStream.leafNode(this.tag, attributes);
       }
     }
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case this.tag:
         this.model = {
           left: parseFloat(node.attributes.left || 0.7),
diff --git a/lib/xlsx/xform/sheet/page-setup-properties-xform.js b/lib/xlsx/xform/sheet/page-setup-properties-xform.js
index 32060b712..ad1586049 100644
--- a/lib/xlsx/xform/sheet/page-setup-properties-xform.js
+++ b/lib/xlsx/xform/sheet/page-setup-properties-xform.js
@@ -23,6 +23,7 @@ utils.inherits(PageSetupPropertiesXform, BaseXform, {
       });
       return true;
     }
+    return false;
   },
   
   parseOpen: function(node) {
diff --git a/lib/xlsx/xform/sheet/page-setup-xform.js b/lib/xlsx/xform/sheet/page-setup-xform.js
index d21b97df2..ba9964282 100644
--- a/lib/xlsx/xform/sheet/page-setup-xform.js
+++ b/lib/xlsx/xform/sheet/page-setup-xform.js
@@ -14,7 +14,7 @@ function booleanToXml(model) {
   return model ? '1' : undefined;
 }
 function pageOrderToXml(model) {
-  switch(model) {
+  switch (model) {
     case 'overThenDown':
       return model;
     default:
@@ -22,7 +22,7 @@ function pageOrderToXml(model) {
   }
 }
 function cellCommentsToXml(model) {
-  switch(model) {
+  switch (model) {
     case 'atEnd':
     case 'asDisplyed':
       return model;
@@ -31,7 +31,7 @@ function cellCommentsToXml(model) {
   }
 }
 function errorsToXml(model) {
-  switch(model) {
+  switch (model) {
     case 'dash':
     case 'blank':
     case 'NA':
@@ -71,7 +71,7 @@ utils.inherits(PageSetupXform, BaseXform, {
         usePrinterDefaults: booleanToXml(model.usePrinterDefaults),
         copies: model.copies
       };
-      if (_.some(attributes, function (value) {
+      if (_.some(attributes, function(value) {
           return value !== undefined;
         })) {
         xmlStream.leafNode(this.tag, attributes);
@@ -80,7 +80,7 @@ utils.inherits(PageSetupXform, BaseXform, {
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case this.tag:
         this.model = {
           paperSize: pageSizeToModel(node.attributes.paperSize),
diff --git a/lib/xlsx/xform/sheet/picture-xform.js b/lib/xlsx/xform/sheet/picture-xform.js
index 302dcfb53..953e8fa48 100644
--- a/lib/xlsx/xform/sheet/picture-xform.js
+++ b/lib/xlsx/xform/sheet/picture-xform.js
@@ -18,12 +18,12 @@ utils.inherits(PictureXform, BaseXform, {
 
   render: function(xmlStream, model) {
     if (model) {
-      xmlStream.leafNode(this.tag, {'r:id': model.rId})
+      xmlStream.leafNode(this.tag, {'r:id': model.rId});
     }
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case this.tag:
         this.model = {
           rId: node.attributes['r:id']
diff --git a/lib/xlsx/xform/sheet/print-options-xform.js b/lib/xlsx/xform/sheet/print-options-xform.js
index 5f2d0ad8d..aefbfd439 100644
--- a/lib/xlsx/xform/sheet/print-options-xform.js
+++ b/lib/xlsx/xform/sheet/print-options-xform.js
@@ -29,7 +29,7 @@ utils.inherits(PrintOptionsXform, BaseXform, {
         horizontalCentered: booleanToXml(model.horizontalCentered),
         verticalCentered: booleanToXml(model.verticalCentered)
       };
-      if (_.some(attributes, function (value) {
+      if (_.some(attributes, function(value) {
           return value !== undefined;
         })) {
         xmlStream.leafNode(this.tag, attributes);
@@ -38,7 +38,7 @@ utils.inherits(PrintOptionsXform, BaseXform, {
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case this.tag:
         this.model = {
           showRowColHeaders: node.attributes.headings === '1',
diff --git a/lib/xlsx/xform/sheet/sheet-format-properties-xform.js b/lib/xlsx/xform/sheet/sheet-format-properties-xform.js
index 020299f99..8730a6e78 100644
--- a/lib/xlsx/xform/sheet/sheet-format-properties-xform.js
+++ b/lib/xlsx/xform/sheet/sheet-format-properties-xform.js
@@ -34,7 +34,7 @@ utils.inherits(SheetFormatPropertiesXform, BaseXform, {
   parseOpen: function(node) {
     if (node.name === 'sheetFormatPr') {
       this.model = {
-        defaultRowHeight:  parseFloat(node.attributes.defaultRowHeight || '0'),
+        defaultRowHeight: parseFloat(node.attributes.defaultRowHeight || '0'),
         dyDescent: parseFloat(node.attributes['x14ac:dyDescent'] || '0'),
         outlineLevelRow: parseInt(node.attributes.outlineLevelRow || '0', 10),
         outlineLevelCol: parseInt(node.attributes.outlineLevelCol || '0', 10),
diff --git a/lib/xlsx/xform/sheet/sheet-properties-xform.js b/lib/xlsx/xform/sheet/sheet-properties-xform.js
index 77f7f58a9..09a47a414 100644
--- a/lib/xlsx/xform/sheet/sheet-properties-xform.js
+++ b/lib/xlsx/xform/sheet/sheet-properties-xform.js
@@ -15,7 +15,7 @@ var SheetPropertiesXform = module.exports = function() {
   this.map = {
     tabColor: new ColorXform('tabColor'),
     pageSetUpPr: new PageSetupPropertiesXform()
-  }
+  };
 };
 
 utils.inherits(SheetPropertiesXform, BaseXform, {
@@ -61,6 +61,7 @@ utils.inherits(SheetPropertiesXform, BaseXform, {
       this.parser.parseText(text);
       return true;
     }
+    return false;
   },
   parseClose: function(name) {
     if (this.parser) {
diff --git a/lib/xlsx/xform/sheet/sheet-view-xform.js b/lib/xlsx/xform/sheet/sheet-view-xform.js
index 32eb4bb42..91c56ce26 100644
--- a/lib/xlsx/xform/sheet/sheet-view-xform.js
+++ b/lib/xlsx/xform/sheet/sheet-view-xform.js
@@ -24,7 +24,7 @@ utils.inherits(SheetViewXform, BaseXform, {
   get tag() { return 'sheetView'; },
   
   prepare: function(model) {
-    switch(model.state) {
+    switch (model.state) {
       case 'frozen':
       case 'split':
         break;
@@ -81,7 +81,7 @@ utils.inherits(SheetViewXform, BaseXform, {
         }
         xmlStream.leafNode('pane', {
           xSplit: model.xSplit || undefined,
-          ySplit:  model.ySplit || undefined,
+          ySplit: model.ySplit || undefined,
           topLeftCell: model.topLeftCell,
           activePane: model.activePane
         });
@@ -106,7 +106,7 @@ utils.inherits(SheetViewXform, BaseXform, {
   },
   
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case 'sheetView':
         this.sheetView = {
           workbookViewId: parseInt(node.attributes.workbookViewId, 10),
@@ -126,7 +126,7 @@ utils.inherits(SheetViewXform, BaseXform, {
           xSplit: parseInt(node.attributes.xSplit || '0', 10),
           ySplit: parseInt(node.attributes.ySplit || '0', 10),
           topLeftCell: node.attributes.topLeftCell,
-          activePane:  node.attributes.activePane || 'topLeft',
+          activePane: node.attributes.activePane || 'topLeft',
           state: node.attributes.state
         };
         return true;
@@ -145,7 +145,7 @@ utils.inherits(SheetViewXform, BaseXform, {
   },
   parseClose: function(name) {
     var model, selection;
-    switch(name) {
+    switch (name) {
       case 'sheetView':
         if (this.sheetView && this.pane) {
           model = this.model = {
diff --git a/lib/xlsx/xform/sheet/worksheet-xform.js b/lib/xlsx/xform/sheet/worksheet-xform.js
index d18e65ddb..9f7314db2 100644
--- a/lib/xlsx/xform/sheet/worksheet-xform.js
+++ b/lib/xlsx/xform/sheet/worksheet-xform.js
@@ -63,7 +63,7 @@ utils.inherits(WorkSheetXform, BaseXform, {
     'mc:Ignorable': 'x14ac',
     'xmlns:x14ac': 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac'
   }
-},{
+}, {
   prepare: function(model, options) {
     options.merges = new Merges();
     model.hyperlinks = options.hyperlinks = [];
@@ -271,7 +271,7 @@ utils.inherits(WorkSheetXform, BaseXform, {
 
     // compact the rows and cells
     model.rows = (model.rows && model.rows.filter(Boolean)) || [];
-    model.rows.forEach(function (row) {
+    model.rows.forEach(function(row) {
       row.cells = (row.cells && row.cells.filter(Boolean)) || [];
     });
 
@@ -281,7 +281,7 @@ utils.inherits(WorkSheetXform, BaseXform, {
     model.media = [];
     if (model.drawing) {
       var drawingRel = rels[model.drawing.rId];
-      var match = drawingRel.Target.match(/\/drawings\/([a-zA-Z0-9]+)\.[a-zA-Z]{3,4}$/);
+      var match = drawingRel.Target.match(/\/drawings\/([a-zA-Z0-9]+)[.][a-zA-Z]{3,4}$/);
       if (match) {
         var drawingName = match[1];
         var drawing = options.drawings[drawingName];
diff --git a/lib/xlsx/xform/simple/date-xform.js b/lib/xlsx/xform/simple/date-xform.js
index 53dd26e2e..72c60fcee 100644
--- a/lib/xlsx/xform/simple/date-xform.js
+++ b/lib/xlsx/xform/simple/date-xform.js
@@ -14,7 +14,7 @@ var DateXform = module.exports = function(options) {
   this.attr = options.attr;
   this.attrs = options.attrs;
   this._format = options.format || function(dt) { return dt.toISOString(); };
-  this._parse = options.parse || function(str) { return new Date(str); }
+  this._parse = options.parse || function(str) { return new Date(str); };
 };
 
 utils.inherits(DateXform, BaseXform, {
diff --git a/lib/xlsx/xform/static-xform.js b/lib/xlsx/xform/static-xform.js
index 64ca85fab..3168ec4c8 100644
--- a/lib/xlsx/xform/static-xform.js
+++ b/lib/xlsx/xform/static-xform.js
@@ -22,7 +22,7 @@ var XmlStream = require('../../utils/xml-stream');
 function build(xmlStream, model) {
   xmlStream.openNode(model.tag, model.$);
   if (model.c) {
-    model.c.forEach(function (child) {
+    model.c.forEach(function(child) {
       build(xmlStream, child);
     });
   }
@@ -58,7 +58,7 @@ utils.inherits(StaticXform, BaseXform, {
   parseText: function() {
   },
   parseClose: function(name) {
-    switch(name) {
+    switch (name) {
       case this._model.tag:
         return false;
       default:
diff --git a/lib/xlsx/xform/strings/phonetic-text-xform.js b/lib/xlsx/xform/strings/phonetic-text-xform.js
index 7113c9f58..24d79c5f9 100644
--- a/lib/xlsx/xform/strings/phonetic-text-xform.js
+++ b/lib/xlsx/xform/strings/phonetic-text-xform.js
@@ -30,7 +30,7 @@ utils.inherits(PhoneticTextXform, BaseXform, {
 
   render: function(xmlStream, model) {
     xmlStream.openNode(this.tag, {
-      sb:  model.sb || 0,
+      sb: model.sb || 0,
       eb: model.eb || 0
     });
     if (model && model.hasOwnProperty('richText') && model.richText) {
@@ -49,19 +49,20 @@ utils.inherits(PhoneticTextXform, BaseXform, {
     if (this.parser) {
       this.parser.parseOpen(node);
       return true;
-    } else if (name === this.tag) {
+    }
+    if (name === this.tag) {
       this.model = {
         sb: parseInt(node.attributes.sb, 10),
         eb: parseInt(node.attributes.eb, 10),
       };
-    } else {
-      this.parser = this.map[name];
-      if (this.parser) {
-        this.parser.parseOpen(node);
-        return true;
-      }
-      return false;
+      return true;
+    }
+    this.parser = this.map[name];
+    if (this.parser) {
+      this.parser.parseOpen(node);
+      return true;
     }
+    return false;
   },
   parseText: function(text) {
     if (this.parser) {
@@ -87,7 +88,7 @@ utils.inherits(PhoneticTextXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case this.tag:
         return false;
       default:
diff --git a/lib/xlsx/xform/strings/rich-text-xform.js b/lib/xlsx/xform/strings/rich-text-xform.js
index 3c100f44c..5a8439746 100644
--- a/lib/xlsx/xform/strings/rich-text-xform.js
+++ b/lib/xlsx/xform/strings/rich-text-xform.js
@@ -29,7 +29,7 @@ var RichTextXform = module.exports = function(model) {
 
 RichTextXform.FONT_OPTIONS = {
   tagName: 'rPr',
-  fontNameTag:  'rFont'
+  fontNameTag: 'rFont'
 };
 
 utils.inherits(RichTextXform, BaseXform, {
@@ -55,7 +55,7 @@ utils.inherits(RichTextXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'r':
         this.model = {};
         return true;
@@ -77,7 +77,7 @@ utils.inherits(RichTextXform, BaseXform, {
     }
   },
   parseClose: function(name) {
-    switch(name) {
+    switch (name) {
       case 'r':
         return false;
       case 't':
diff --git a/lib/xlsx/xform/strings/shared-string-xform.js b/lib/xlsx/xform/strings/shared-string-xform.js
index b8222b663..666035a04 100644
--- a/lib/xlsx/xform/strings/shared-string-xform.js
+++ b/lib/xlsx/xform/strings/shared-string-xform.js
@@ -88,7 +88,7 @@ utils.inherits(SharedStringXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case this.tag:
         return false;
       default:
diff --git a/lib/xlsx/xform/strings/shared-strings-xform.js b/lib/xlsx/xform/strings/shared-strings-xform.js
index 6562bc60f..ede5a2ec6 100644
--- a/lib/xlsx/xform/strings/shared-strings-xform.js
+++ b/lib/xlsx/xform/strings/shared-strings-xform.js
@@ -91,7 +91,7 @@ utils.inherits(SharedStringsXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'sst':
         return true;
       case 'si':
@@ -116,7 +116,7 @@ utils.inherits(SharedStringsXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case 'sst':
         return false;
       default:
diff --git a/lib/xlsx/xform/strings/text-xform.js b/lib/xlsx/xform/strings/text-xform.js
index e54e2c025..c161da4c0 100644
--- a/lib/xlsx/xform/strings/text-xform.js
+++ b/lib/xlsx/xform/strings/text-xform.js
@@ -32,7 +32,7 @@ utils.inherits(TextXform, BaseXform, {
   },
 
   parseOpen: function(node) {
-    switch(node.name) {
+    switch (node.name) {
       case 't':
         this._text = [];
         return true;
diff --git a/lib/xlsx/xform/style/alignment-xform.js b/lib/xlsx/xform/style/alignment-xform.js
index bf0c31ac7..6d4844e94 100644
--- a/lib/xlsx/xform/style/alignment-xform.js
+++ b/lib/xlsx/xform/style/alignment-xform.js
@@ -20,7 +20,7 @@ var validation = {
     'centerContinuous',
     'distributed',
     'justify'
-  ].reduce((p,v) => { p[v] = true; return p; }, {}),
+  ].reduce((p, v) => { p[v] = true; return p; }, {}),
   horizontal: function(value) {
     return this.horizontalValues[value] ? value : undefined;
   },
@@ -31,7 +31,7 @@ var validation = {
     'bottom',
     'distributed',
     'justify'
-  ].reduce((p,v) => { p[v] = true; return p; }, {}),
+  ].reduce((p, v) => { p[v] = true; return p; }, {}),
   vertical: function(value) {
     if (value === 'middle') return 'center';
     return this.verticalValues[value] ? value : undefined;
@@ -43,7 +43,7 @@ var validation = {
     return value ? true : undefined;
   },
   textRotation: function(value) {
-    switch(value) {
+    switch (value) {
       case 'vertical':
         return value;
       default:
@@ -56,11 +56,11 @@ var validation = {
     return Math.max(0, value);
   },
   readingOrderValues: [
-    {k:'r2l',v:1},
-    {k:'l2r',v:2},
-    {k:Enums.ReadingOrder.RightToLeft,v:1},
-    {k:Enums.ReadingOrder.LeftToRight,v:2}
-  ].reduce((p,v) => { p[v.k] = v.v; return p; }, {}),
+    {k: 'r2l', v: 1},
+    {k: 'l2r', v: 2},
+    {k: Enums.ReadingOrder.RightToLeft, v: 1},
+    {k: Enums.ReadingOrder.LeftToRight, v: 2}
+  ].reduce((p, v) => { p[v.k] = v.v; return p; }, {}),
 
   readingOrder: function(value) {
     return this.readingOrderValues[value];
@@ -68,7 +68,7 @@ var validation = {
 };
 
 var textRotationXform = {
-  toXml:  function(textRotation) {
+  toXml: function(textRotation) {
     textRotation = validation.textRotation(textRotation);
     if (textRotation) {
       if (textRotation === 'vertical') {
@@ -78,10 +78,13 @@ var textRotationXform = {
       var tr = Math.round(textRotation);
       if ((tr >= 0) && (tr <= 90)) {
         return tr;
-      } else if ((tr < 0) && (tr >= -90)) {
+      }
+
+      if ((tr < 0) && (tr >= -90)) {
         return 90 - tr;
       }
     }
+    return undefined;
   },
   toModel: function(textRotation) {
     var tr = utils.validInt(textRotation);
@@ -89,13 +92,14 @@ var textRotationXform = {
       if (tr === 255) {
         return 'vertical';
       }
-      if((tr >= 0) && (tr <= 90)) {
+      if ((tr >= 0) && (tr <= 90)) {
         return tr;
       }
       if ((tr > 90) && (tr <= 180)) {
         return 90 - tr;
       }
     }
+    return undefined;
   }
 };
 
diff --git a/lib/xlsx/xform/style/border-xform.js b/lib/xlsx/xform/style/border-xform.js
index eda6a83f5..637d89856 100644
--- a/lib/xlsx/xform/style/border-xform.js
+++ b/lib/xlsx/xform/style/border-xform.js
@@ -95,7 +95,7 @@ utils.inherits(EdgeXform, BaseXform, {
     'medium',
     'double',
     'thick'
-  ].reduce((p,v) => { p[v] = true; return p; }, {}),
+  ].reduce((p, v) => { p[v] = true; return p; }, {}),
   validStyle: function(value) {
     return this.validStyleValues[value];
   }
@@ -145,7 +145,7 @@ utils.inherits(BorderXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'border':
         this.reset();
         this.diagonalUp = !!node.attributes.diagonalUp;
diff --git a/lib/xlsx/xform/style/color-xform.js b/lib/xlsx/xform/style/color-xform.js
index 1bede753d..2c7de14a2 100644
--- a/lib/xlsx/xform/style/color-xform.js
+++ b/lib/xlsx/xform/style/color-xform.js
@@ -30,13 +30,14 @@ utils.inherits(ColorXform, BaseXform, {
           xmlStream.addAttribute('tint', model.tint);
         }
       } else if (model.indexed !== undefined) {
-        xmlStream.addAttribute('indexed', model.indexed)
+        xmlStream.addAttribute('indexed', model.indexed);
       } else {
         xmlStream.addAttribute('auto', '1');
       }
       xmlStream.closeNode();
       return true;
     }
+    return false;
   },
   
   parseOpen: function(node) {
diff --git a/lib/xlsx/xform/style/fill-xform.js b/lib/xlsx/xform/style/fill-xform.js
index 532ef6201..309292414 100644
--- a/lib/xlsx/xform/style/fill-xform.js
+++ b/lib/xlsx/xform/style/fill-xform.js
@@ -21,7 +21,7 @@ utils.inherits(StopXform, BaseXform, {
 
   get tag() { return 'stop'; },
 
-  render:  function(xmlStream, model) {
+  render: function(xmlStream, model) {
     xmlStream.openNode('stop');
     xmlStream.addAttribute('position', model.position);
     this.map.color.render(xmlStream, model.color);
@@ -87,7 +87,7 @@ utils.inherits(PatternFillXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'patternFill':
         this.model = {
             type: 'pattern',
@@ -225,7 +225,7 @@ utils.inherits(GradientFillXform, BaseXform, {
       this.parser.parseText(text);
     }
   },
-  parseClose:  function(name) {
+  parseClose: function(name) {
     if (this.parser) {
       if (!this.parser.parseClose(name)) {
         this.model.stops.push(this.parser.model);
@@ -240,7 +240,7 @@ utils.inherits(GradientFillXform, BaseXform, {
 // Fill encapsulates translation from fill model to/from xlsx
 var FillXform = module.exports = function() {
   this.map = {
-    patternFill:  new PatternFillXform(),
+    patternFill: new PatternFillXform(),
     gradientFill: new GradientFillXform()
   };
 };
@@ -249,13 +249,13 @@ utils.inherits(FillXform, BaseXform, {
   StopXform: StopXform,
   PatternFillXform: PatternFillXform,
   GradientFillXform: GradientFillXform
-},{
+}, {
   get tag() { return 'fill'; },
 
   render: function(xmlStream, model) {
     xmlStream.addRollback();
     xmlStream.openNode('fill');
-    switch(model.type) {
+    switch (model.type) {
       case 'pattern':
         this.map.patternFill.render(xmlStream, model);
         break;
@@ -294,7 +294,7 @@ utils.inherits(FillXform, BaseXform, {
       this.parser.parseText(text);
     }
   },
-  parseClose:  function(name) {
+  parseClose: function(name) {
     if (this.parser) {
       if (!this.parser.parseClose(name)) {
         this.model = this.parser.model;
@@ -328,7 +328,7 @@ utils.inherits(FillXform, BaseXform, {
     'lightGrid',
     'lightTrellis',
     'lightGrid'
-  ].reduce((p,v) => { p[v] = true; return p; }, {}),
+  ].reduce((p, v) => { p[v] = true; return p; }, {}),
   validStyle: function(value) {
     return this.validStyleValues[value];
   }
diff --git a/lib/xlsx/xform/style/font-xform.js b/lib/xlsx/xform/style/font-xform.js
index 018a9d466..46234fe77 100644
--- a/lib/xlsx/xform/style/font-xform.js
+++ b/lib/xlsx/xform/style/font-xform.js
@@ -61,7 +61,8 @@ utils.inherits(FontXform, BaseXform, {
     if (this.parser) {
       this.parser.parseOpen(node);
       return true;
-    } else if(this.map[node.name]) {
+    }
+    if (this.map[node.name]) {
       this.parser = this.map[node.name].xform;
       return this.parser.parseOpen(node);
     }
@@ -73,7 +74,7 @@ utils.inherits(FontXform, BaseXform, {
         return false;
     }
   },
-  parseText:  function(text) {
+  parseText: function(text) {
     if (this.parser) {
       this.parser.parseText(text);
     }
diff --git a/lib/xlsx/xform/style/numfmt-xform.js b/lib/xlsx/xform/style/numfmt-xform.js
index 48e5668c7..0e1e6d934 100644
--- a/lib/xlsx/xform/style/numfmt-xform.js
+++ b/lib/xlsx/xform/style/numfmt-xform.js
@@ -43,12 +43,12 @@ utils.inherits(NumFmtXform, BaseXform, {
   getDefaultFmtCode: function(numFmtId) {
     return defaultNumFormats[numFmtId] && defaultNumFormats[numFmtId].f;
   }
-},{
+}, {
   render: function(xmlStream, model) {
     xmlStream.leafNode('numFmt', {numFmtId: model.id, formatCode: model.formatCode});
   },
-  parseOpen:  function(node) {
-    switch(node.name) {
+  parseOpen: function(node) {
+    switch (node.name) {
       case 'numFmt':
         this.model = {
           id: parseInt(node.attributes.numFmtId, 10),
diff --git a/lib/xlsx/xform/style/styles-xform.js b/lib/xlsx/xform/style/styles-xform.js
index 0d6e9e3fa..1a88150fd 100644
--- a/lib/xlsx/xform/style/styles-xform.js
+++ b/lib/xlsx/xform/style/styles-xform.js
@@ -41,7 +41,7 @@ var StylesXform = module.exports = function(initialise) {
     numFmt: new NumFmtXform(),
     font: new FontXform(),
     fill: new FillXform(),
-    border:  new BorderXform(),
+    border: new BorderXform(),
     style: new StyleXform({xfId: true}),
 
     cellStyles: StylesXform.STATIC_XFORMS.cellStyles,
@@ -65,19 +65,19 @@ utils.inherits(StylesXform, BaseXform, {
     'xmlns:x16r2': 'http://schemas.microsoft.com/office/spreadsheetml/2015/02/main'
   },
   STATIC_XFORMS: {
-    cellStyles: new StaticXform({tag: 'cellStyles', $: {count:1}, c: [{tag:'cellStyle', $: {name:'Normal', xfId:0, builtinId:0}}]}),
-    dxfs: new StaticXform({tag: 'dxfs', $: {count:0}}),
+    cellStyles: new StaticXform({tag: 'cellStyles', $: {count: 1}, c: [{tag: 'cellStyle', $: {name: 'Normal', xfId: 0, builtinId: 0}}]}),
+    dxfs: new StaticXform({tag: 'dxfs', $: {count: 0}}),
     tableStyles: new StaticXform({tag: 'tableStyles', $: {count: 0, defaultTableStyle: 'TableStyleMedium2', defaultPivotStyle: 'PivotStyleLight16'}}),
     extLst: new StaticXform({tag: 'extLst', c: [
-      {tag: 'ext', $: {uri:'{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}', 'xmlns:x14': 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/main'}, c: [
-        {tag: 'x14:slicerStyles', $:{defaultSlicerStyle: 'SlicerStyleLight1'}}
+      {tag: 'ext', $: {uri: '{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}', 'xmlns:x14': 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/main'}, c: [
+        {tag: 'x14:slicerStyles', $: {defaultSlicerStyle: 'SlicerStyleLight1'}}
       ]},
-      {tag: 'ext', $: {uri:'{9260A510-F301-46a8-8635-F512D64BE5F5}', 'xmlns:x15': 'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main'}, c: [
-        {tag: 'x15:timelineStyles', $:{defaultTimelineStyle: 'TimeSlicerStyleLight1'}}
+      {tag: 'ext', $: {uri: '{9260A510-F301-46a8-8635-F512D64BE5F5}', 'xmlns:x15': 'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main'}, c: [
+        {tag: 'x15:timelineStyles', $: {defaultTimelineStyle: 'TimeSlicerStyleLight1'}}
       ]}
     ]})
   }
-},{
+}, {
 
   initIndex: function() {
     this.index = {
@@ -103,7 +103,7 @@ utils.inherits(StylesXform, BaseXform, {
     this.initIndex();
 
     // default (zero) font
-    this._addFont({size: 11, color: {theme:1}, name: 'Calibri', family:2, scheme:'minor'});
+    this._addFont({size: 11, color: {theme: 1}, name: 'Calibri', family: 2, scheme: 'minor'});
 
     // default (zero) border
     this._addBorder({});
@@ -112,8 +112,8 @@ utils.inherits(StylesXform, BaseXform, {
     this._addStyle({numFmtId: 0, fontId: 0, fillId: 0, borderId: 0, xfId: 0});
 
     // add default fills
-    this._addFill({type: 'pattern', pattern:'none'});
-    this._addFill({type: 'pattern', pattern:'gray125'});
+    this._addFill({type: 'pattern', pattern: 'none'});
+    this._addFill({type: 'pattern', pattern: 'gray125'});
   },
 
   render: function(xmlStream, model) {
@@ -183,7 +183,7 @@ utils.inherits(StylesXform, BaseXform, {
       this.parser.parseOpen(node);
       return true;
     }
-    switch(node.name) {
+    switch (node.name) {
       case 'styleSheet':
         this.initIndex();
         return true;
@@ -207,7 +207,7 @@ utils.inherits(StylesXform, BaseXform, {
       }
       return true;
     }
-    switch(name) {
+    switch (name) {
       case 'styleSheet':
         var model = this.model = {};
         var add = function(propName, xform) {
@@ -223,12 +223,12 @@ utils.inherits(StylesXform, BaseXform, {
 
         // index numFmts
         this.index = {
-          model:[],
-          numFmt:  []
+          model: [],
+          numFmt: []
         };
         if (model.numFmts) {
           var numFmtIndex = this.index.numFmt;
-          model.numFmts.forEach(function (numFmt) {
+          model.numFmts.forEach(function(numFmt) {
             numFmtIndex[numFmt.id] = numFmt.formatCode;
           });
         }
@@ -414,11 +414,11 @@ StylesXform.Mock = function() {
   this.model = {
     styles: [{numFmtId: 0, fontId: 0, fillId: 0, borderId: 0, xfId: 0}],
     numFmts: [],
-    fonts: [{size: 11, color: {theme:1}, name: 'Calibri', family:2, scheme:'minor'}],
+    fonts: [{size: 11, color: {theme: 1}, name: 'Calibri', family: 2, scheme: 'minor'}],
     borders: [{}],
-    fills:  [
-      {type: 'pattern', pattern:'none'},
-      {type: 'pattern', pattern:'gray125'}
+    fills: [
+      {type: 'pattern', pattern: 'none'},
+      {type: 'pattern', pattern: 'gray125'}
     ]
   };
 };
diff --git a/lib/xlsx/xform/style/underline-xform.js b/lib/xlsx/xform/style/underline-xform.js
index 5f64facda..cb73c4ef3 100644
--- a/lib/xlsx/xform/style/underline-xform.js
+++ b/lib/xlsx/xform/style/underline-xform.js
@@ -28,7 +28,7 @@ utils.inherits(UnderlineXform, BaseXform, {
     model = model || this.model;
 
     if (model === true) {
-      xmlStream.leafNode('u')
+      xmlStream.leafNode('u');
     } else {
       var attr = UnderlineXform.Attributes[model];
       if (attr) {
diff --git a/lib/xlsx/xlsx.js b/lib/xlsx/xlsx.js
index 22bdfaf92..51f9019b6 100644
--- a/lib/xlsx/xlsx.js
+++ b/lib/xlsx/xlsx.js
@@ -27,7 +27,7 @@ var DrawingXform = require('./xform/drawing/drawing-xform');
 
 var theme1Xml = require('./xml/theme1.js');
 
-var XLSX = module.exports = function (workbook) {
+var XLSX = module.exports = function(workbook) {
   this.workbook = workbook;
 };
 
@@ -39,7 +39,7 @@ function fsReadFileAsync(filename, options) {
       } else {
         resolve(data);
       }
-    })
+    });
   });
 }
 
@@ -51,35 +51,35 @@ XLSX.prototype = {
   // =========================================================================
   // Read
 
-  readFile: function (filename) {
+  readFile: function(filename) {
     var self = this;
     var stream;
     return utils.fs.exists(filename)
-      .then(function (exists) {
+      .then(function(exists) {
         if (!exists) {
           throw new Error('File not found: ' + filename);
         }
         stream = fs.createReadStream(filename);
         return self.read(stream);
       })
-      .then(function (workbook) {
+      .then(function(workbook) {
         stream.close();
         return workbook;
       });
   },
-  parseRels: function (stream) {
+  parseRels: function(stream) {
     var xform = new RelationshipsXform();
     return xform.parseStream(stream);
   },
-  parseWorkbook: function (stream) {
+  parseWorkbook: function(stream) {
     var xform = new WorkbookXform();
     return xform.parseStream(stream);
   },
-  parseSharedStrings: function (stream) {
+  parseSharedStrings: function(stream) {
     var xform = new SharedStringsXform();
     return xform.parseStream(stream);
   },
-  reconcile: function (model) {
+  reconcile: function(model) {
     var workbookXform = new WorkbookXform();
     var worksheetXform = new WorksheetXform();
     var drawingXform = new DrawingXform();
@@ -90,7 +90,7 @@ XLSX.prototype = {
     var drawingOptions = {
       media: model.media,
       mediaIndex: model.mediaIndex,
-    }
+    };
     Object.keys(model.drawings).forEach(function(name) {
       var drawing = model.drawings[name];
       var drawingRel = model.drawingRels[name];
@@ -111,7 +111,7 @@ XLSX.prototype = {
       date1904: model.properties.date1904,
       drawings: model.drawings,
     };
-    model.worksheets.forEach(function (worksheet) {
+    model.worksheets.forEach(function(worksheet) {
       worksheet.relationships = model.worksheetRels[worksheet.sheetNo];
       worksheetXform.reconcile(worksheet, sheetOptions);
     });
@@ -129,20 +129,21 @@ XLSX.prototype = {
     delete model.drawingRels;
   },
   processWorksheetEntry: function(entry, model) {
-    var match = entry.path.match(/xl\/worksheets\/sheet(\d+)\.xml/);
+    var match = entry.path.match(/xl\/worksheets\/sheet(\d+)[.]xml/);
     if (match) {
       var sheetNo = match[1];
       var xform = new WorksheetXform();
       return xform.parseStream(entry)
-        .then(function (worksheet) {
+        .then(function(worksheet) {
           worksheet.sheetNo = sheetNo;
           model.worksheetHash[entry.path] = worksheet;
           model.worksheets.push(worksheet);
         });
     }
+    return undefined;
   },
   processWorksheetRelsEntry: function(entry, model) {
-    var match = entry.path.match(/xl\/worksheets\/_rels\/sheet(\d+)\.xml.rels/);
+    var match = entry.path.match(/xl\/worksheets\/_rels\/sheet(\d+)[.]xml.rels/);
     if (match) {
       var sheetNo = match[1];
       var xform = new RelationshipsXform();
@@ -151,21 +152,22 @@ XLSX.prototype = {
           model.worksheetRels[sheetNo] = relationships;
         });
     }
+    return undefined;
   },
   processMediaEntry: function(entry, model) {
-    var match = entry.path.match(/xl\/media\/([a-zA-Z0-9]+\.[a-zA-Z0-9]{3,4})$/);
+    var match = entry.path.match(/xl\/media\/([a-zA-Z0-9]+[.][a-zA-Z0-9]{3,4})$/);
     if (match) {
       var filename = match[1];
       var lastDot = filename.lastIndexOf('.');
       if (lastDot === -1) {
         // if we can't determine extension, ignore it
-        return;
+        return undefined;
       }
       var extension = filename.substr(lastDot + 1);
       var name = filename.substr(0, lastDot);
-      return new PromishLib.Promish(function (resolve, reject) {
+      return new PromishLib.Promish(function(resolve, reject) {
         var streamBuf = new StreamBuf();
-        streamBuf.on('finish', function () {
+        streamBuf.on('finish', function() {
           model.mediaIndex[filename] = model.media.length;
           model.mediaIndex[name] = model.media.length;
           var medium = {
@@ -177,15 +179,16 @@ XLSX.prototype = {
           model.media.push(medium);
           resolve();
         });
-        entry.on('error', function (error) {
+        entry.on('error', function(error) {
           reject(error);
         });
         entry.pipe(streamBuf);
       });
     }
+    return undefined;
   },
   processDrawingEntry: function(entry, model) {
-    var match = entry.path.match(/xl\/drawings\/([a-zA-Z0-9]+)\.xml/);
+    var match = entry.path.match(/xl\/drawings\/([a-zA-Z0-9]+)[.]xml/);
     if (match) {
       var name = match[1];
       var xform = new DrawingXform();
@@ -194,9 +197,10 @@ XLSX.prototype = {
           model.drawings[name] = drawing;
         });
     }
+    return undefined;
   },
   processDrawingRelsEntry: function(entry, model) {
-    var match = entry.path.match(/xl\/drawings\/_rels\/([a-zA-Z0-9]+)\.xml\.rels/);
+    var match = entry.path.match(/xl\/drawings\/_rels\/([a-zA-Z0-9]+)[.]xml[.]rels/);
     if (match) {
       var name = match[1];
       var xform = new RelationshipsXform();
@@ -205,9 +209,10 @@ XLSX.prototype = {
           model.drawingRels[name] = relationships;
         });
     }
+    return undefined;
   },
   processThemeEntry: function(entry, model) {
-    var match = entry.path.match(/xl\/theme\/([a-zA-Z0-9]+)\.xml/);
+    var match = entry.path.match(/xl\/theme\/([a-zA-Z0-9]+)[.]xml/);
     if (match) {
       return new PromishLib.Promish(function(resolve, reject) {
         var name = match[1];
@@ -222,11 +227,12 @@ XLSX.prototype = {
         entry.pipe(stream);
       });
     }
+    return undefined;
   },
   processIgnoreEntry: function(entry) {
     entry.autodrain();
   },
-  createInputStream: function () {
+  createInputStream: function() {
     var self = this;
     var model = {
       worksheets: [],
@@ -244,7 +250,7 @@ XLSX.prototype = {
     var stream = new ZipStream.ZipReader({
       getEntryType: path => (path.match(/xl\/media\//) ? 'nodebuffer' : 'string'),
     });
-    stream.on('entry', function (entry) {
+    stream.on('entry', function(entry) {
       var promise = null;
 
       var entryPath = entry.path;
@@ -254,14 +260,14 @@ XLSX.prototype = {
       switch (entryPath) {
         case '_rels/.rels':
           promise = self.parseRels(entry)
-            .then(function (relationships) {
+            .then(function(relationships) {
               model.globalRels = relationships;
             });
           break;
 
         case 'xl/workbook.xml':
           promise = self.parseWorkbook(entry)
-            .then(function (workbook) {
+            .then(function(workbook) {
               model.sheets = workbook.sheets;
               model.definedNames = workbook.definedNames;
               model.views = workbook.views;
@@ -271,7 +277,7 @@ XLSX.prototype = {
 
         case 'xl/_rels/workbook.xml.rels':
           promise = self.parseRels(entry)
-            .then(function (relationships) {
+            .then(function(relationships) {
               model.workbookRels = relationships;
             });
           break;
@@ -322,31 +328,31 @@ XLSX.prototype = {
         promise = null;
       }
     });
-    stream.on('finished', function () {
+    stream.on('finished', function() {
       PromishLib.Promish.all(promises)
-        .then(function () {
+        .then(function() {
           self.reconcile(model);
 
           // apply model
           self.workbook.model = model;
         })
-        .then(function () {
+        .then(function() {
           stream.emit('done');
         })
-        .catch(function (error) {
+        .catch(function(error) {
           stream.emit('error', error);
         });
     });
     return stream;
   },
 
-  read: function (stream) {
+  read: function(stream) {
     var self = this;
     var zipStream = this.createInputStream();
     return new PromishLib.Promish(function(resolve, reject) {
-      zipStream.on('done', function () {
+      zipStream.on('done', function() {
         resolve(self.workbook);
-      }).on('error', function (error) {
+      }).on('error', function(error) {
         reject(error);
       });
       stream.pipe(zipStream);
@@ -360,9 +366,9 @@ XLSX.prototype = {
     }
     var zipStream = this.createInputStream();
     return new PromishLib.Promish(function(resolve, reject) {
-      zipStream.on('done', function () {
+      zipStream.on('done', function() {
         resolve(self.workbook);
-      }).on('error', function (error) {
+      }).on('error', function(error) {
         reject(error);
       });
 
@@ -405,7 +411,7 @@ XLSX.prototype = {
     var relsXform = new RelationshipsXform();
     var promises = [];
 
-    model.worksheets.forEach(function (worksheet) {
+    model.worksheets.forEach(function(worksheet) {
       var drawing = worksheet.drawing;
       if (drawing) {
         promises.push(new PromishLib.Promish(function(resolve) {
@@ -424,7 +430,7 @@ XLSX.prototype = {
     return PromishLib.Promish.all(promises);
   },
 
-  addContentTypes: function (zip, model) {
+  addContentTypes: function(zip, model) {
     return new PromishLib.Promish(function(resolve) {
       var xform = new ContentTypesXform();
       var xml = xform.toXml(model);
@@ -433,7 +439,7 @@ XLSX.prototype = {
     });
   },
 
-  addApp: function (zip, model) {
+  addApp: function(zip, model) {
     return new PromishLib.Promish(function(resolve) {
       var xform = new AppXform();
       var xml = xform.toXml(model);
@@ -442,7 +448,7 @@ XLSX.prototype = {
     });
   },
 
-  addCore: function (zip, model) {
+  addCore: function(zip, model) {
     return new PromishLib.Promish(function(resolve) {
       var coreXform = new CoreXform();
       zip.append(coreXform.toXml(model), {name: 'docProps/core.xml'});
@@ -450,7 +456,7 @@ XLSX.prototype = {
     });
   },
 
-  addThemes: function (zip, model) {
+  addThemes: function(zip, model) {
     return new PromishLib.Promish(function(resolve) {
       var themes = model.themes || { theme1: theme1Xml };
       Object.keys(themes).forEach(function(name) {
@@ -462,7 +468,7 @@ XLSX.prototype = {
     });
   },
 
-  addOfficeRels: function (zip) {
+  addOfficeRels: function(zip) {
     return new PromishLib.Promish(function(resolve) {
       var xform = new RelationshipsXform();
       var xml = xform.toXml([
@@ -473,7 +479,7 @@ XLSX.prototype = {
     });
   },
 
-  addWorkbookRels: function (zip, model) {
+  addWorkbookRels: function(zip, model) {
     var count = 1;
     var relationships = [
         {Id: 'rId' + (count++), Type: XLSX.RelType.Styles, Target: 'styles.xml'},
@@ -484,7 +490,7 @@ XLSX.prototype = {
         {Id: 'rId' + (count++), Type: XLSX.RelType.SharedStrings, Target: 'sharedStrings.xml'}
       );
     }
-    model.worksheets.forEach(function (worksheet) {
+    model.worksheets.forEach(function(worksheet) {
       worksheet.rId = 'rId' + (count++);
       relationships.push(
         {Id: worksheet.rId, Type: XLSX.RelType.Worksheet, Target: 'worksheets/sheet' + worksheet.id + '.xml'}
@@ -497,7 +503,7 @@ XLSX.prototype = {
       resolve();
     });
   },
-  addSharedStrings: function (zip, model) {
+  addSharedStrings: function(zip, model) {
     if (!model.sharedStrings || !model.sharedStrings.count) {
       return PromishLib.Promish.resolve();
     }
@@ -515,21 +521,21 @@ XLSX.prototype = {
       resolve();
     });
   },
-  addWorkbook: function (zip, model) {
+  addWorkbook: function(zip, model) {
     return new PromishLib.Promish(function(resolve) {
       var xform = new WorkbookXform();
       zip.append(xform.toXml(model), {name: 'xl/workbook.xml'});
       resolve();
     });
   },
-  addWorksheets: function (zip, model) {
+  addWorksheets: function(zip, model) {
     return new PromishLib.Promish(function(resolve) {
       // preparation phase
       var worksheetXform = new WorksheetXform();
       var relationshipsXform = new RelationshipsXform();
 
       // write sheets
-      model.worksheets.forEach(function (worksheet) {
+      model.worksheets.forEach(function(worksheet) {
         var xmlStream = new XmlStream();
         worksheetXform.render(xmlStream, worksheet);
         zip.append(xmlStream.xml, {name: 'xl/worksheets/sheet' + worksheet.id + '.xml'});
@@ -544,7 +550,7 @@ XLSX.prototype = {
       resolve();
     });
   },
-  _finalize: function (zip) {
+  _finalize: function(zip) {
     return new PromishLib.Promish((resolve, reject) => {
       zip.on('finish', () => {
         resolve(this);
@@ -584,16 +590,16 @@ XLSX.prototype = {
       styles: model.styles,
       date1904: model.properties.date1904,
       drawingsCount: 0,
-      media:  model.media,
+      media: model.media,
     };
     worksheetOptions.drawings = model.drawings = [];
-    model.worksheets.forEach(function (worksheet) {
+    model.worksheets.forEach(function(worksheet) {
       worksheetXform.prepare(worksheet, worksheetOptions);
     });
 
     // TODO: workbook drawing list
   },
-  write: function (stream, options) {
+  write: function(stream, options) {
     options = options || {};
     var self = this;
     var model = this.workbook.model;
@@ -628,23 +634,23 @@ XLSX.prototype = {
       .then(() => this.addWorkbook(zip, model))
       .then(() => this._finalize(zip));
   },
-  writeFile: function (filename, options) {
+  writeFile: function(filename, options) {
     var self = this;
     var stream = fs.createWriteStream(filename);
 
     return new PromishLib.Promish(function(resolve, reject) {
-      stream.on('finish', function () {
+      stream.on('finish', function() {
         resolve();
       });
-      stream.on('error', function (error) {
+      stream.on('error', function(error) {
         reject(error);
       });
 
       self.write(stream, options)
-        .then(function () {
+        .then(function() {
           stream.end();
         })
-        .catch(function (error) {
+        .catch(function(error) {
           reject(error);
         });
     });
diff --git a/package.json b/package.json
index 603de1370..408f47f8e 100644
--- a/package.json
+++ b/package.json
@@ -17,15 +17,15 @@
     "clean-build": "npm run clean && npm run build",
     "lint": "eslint --ext .js lib spec",
     "browser-test": "./node_modules/.bin/grunt jasmine",
-    "unit-test": "mocha --require spec/config/setup spec/unit --recursive",
+    "unit-test": "mocha --require spec/config/setup spec/unit --require spec/config/setup-unit --recursive",
     "integration-test": "mocha --require spec/config/setup spec/integration --recursive",
     "native-integration-test": "export EXCEL_NATIVE=yes && mocha --require spec/config/setup spec/integration --recursive",
     "end-to-end-test": "mocha --require spec/config/setup spec/end-to-end --recursive",
     "clean": "rm -rf build/ && rm -rf dist",
     "build": "./node_modules/.bin/grunt build",
     "manual-test": "node spec/manual/app.js",
-    "prepublish": "npm run clean && npm run build && npm test",
-    "preversion": "npm run clean && npm run build && npm test"
+    "preversion": "npm run clean && npm run build && npm test",
+    "postversion": "git push --no-verify && git push --tags --no-verify"
   },
   "keywords": [
     "xlsx",
diff --git a/spec/.eslintrc b/spec/.eslintrc
index a0d7fb215..d2ca8bbc9 100644
--- a/spec/.eslintrc
+++ b/spec/.eslintrc
@@ -2,7 +2,11 @@
   "extends": "../.eslintrc",
   "rules": {
     "no-new": ["off"],
-    "max-len": ["off"]
+    "max-len": ["off"],
+    "brace-style": ["off"],
+    "array-bracket-spacing": ["off"],
+    "no-sparse-arrays": ["off"],
+    "object-property-newline": ["off"]
   },
   "globals": {
     "describe": true,
diff --git a/spec/browser/exceljs.spec.js b/spec/browser/exceljs.spec.js
index 7fbfa8fae..61bdb9a62 100644
--- a/spec/browser/exceljs.spec.js
+++ b/spec/browser/exceljs.spec.js
@@ -9,7 +9,7 @@ function unexpectedError(done) {
     console.error('Error Caught', error.message, error.stack);
     expect(true).toEqual(false);
     done();
-  }
+  };
 }
 
 describe('ExcelJS', function() {
diff --git a/spec/config/setup-unit.js b/spec/config/setup-unit.js
new file mode 100644
index 000000000..6e8cbfa3d
--- /dev/null
+++ b/spec/config/setup-unit.js
@@ -0,0 +1,5 @@
+// must configure PromishLib for unit tests
+const Promish = require('promish');
+const PromishLib = require('../../lib/utils/promish');
+
+PromishLib.Promish = Promish;
diff --git a/spec/end-to-end/express.spec.js b/spec/end-to-end/express.spec.js
index 77577c949..887a5bb74 100644
--- a/spec/end-to-end/express.spec.js
+++ b/spec/end-to-end/express.spec.js
@@ -33,12 +33,11 @@ describe('Express', function() {
         stream.on('done', function() {
           try {
             testutils.checkTestBook(wb2, 'xlsx');
+            server.close();
+            resolve();
+          } catch (ex) {
+            reject(ex);
           }
-          catch(ex) {
-            return reject(ex);
-          }
-          server.close();
-          resolve();
         });
         res.pipe(stream);
       });
diff --git a/spec/integration/issues/issue-219-1904-dates.spec.js b/spec/integration/issues/issue-219-1904-dates.spec.js
index 368277857..52fc1811b 100644
--- a/spec/integration/issues/issue-219-1904-dates.spec.js
+++ b/spec/integration/issues/issue-219-1904-dates.spec.js
@@ -15,10 +15,10 @@ var TEST_XLSX_FILE_NAME = './spec/out/wb.test.xlsx';
 
 describe('github issues', function() {
   describe('issue 219 - 1904 dates not supported', function() {
-    it('Reading 1904.xlsx', function () {
+    it('Reading 1904.xlsx', function() {
       var wb = new Excel.Workbook();
       return wb.xlsx.readFile('./spec/integration/data/1904.xlsx')
-        .then(function () {
+        .then(function() {
           expect(wb.properties.date1904).to.equal(true);
 
           var ws = wb.getWorksheet('Sheet1');
diff --git a/spec/integration/issues/issue-266-breaking-bluebird.spec.js b/spec/integration/issues/issue-266-breaking-bluebird.spec.js
index 9e30d1092..38e7c7245 100644
--- a/spec/integration/issues/issue-266-breaking-bluebird.spec.js
+++ b/spec/integration/issues/issue-266-breaking-bluebird.spec.js
@@ -16,47 +16,47 @@ var TEST_XLSX_FILE_NAME = './spec/out/wb.test.xlsx';
 describe('github issues', function() {
   describe('issue 266 - Breaking change removing bluebird', function() {
     var promish;
-    beforeEach(function () {
+    beforeEach(function() {
       promish = PromishLib.Promish;
     });
-    afterEach(function () {
+    afterEach(function() {
       PromishLib.Promish = promish;
     });
 
-    it('common bluebird functions', function () {
+    it('common bluebird functions', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('Sheet1');
       var calledFinally = false;
       ws.getCell('A1').value = 'Hello, World!';
       return wb.xlsx.writeFile(TEST_XLSX_FILE_NAME)
-        .then(function () {
+        .then(function() {
           var wb2 = new Excel.Workbook();
           return wb2.xlsx.readFile(TEST_XLSX_FILE_NAME);
         })
-        .then(function () {
+        .then(function() {
           return Promise.all([
             Promise.resolve('a'),
             Promise.resolve('b')
-          ])
+          ]);
         })
-        .map(function (value) {
+        .map(function(value) {
           return value + value;
         })
-        .spread(function (a, b) {
+        .spread(function(a, b) {
           expect(a).to.equal('aa');
           expect(b).to.equal('bb');
           return 'c';
         })
-        .finally(function () {
+        .finally(function() {
           calledFinally = true;
         })
-        .then(function (value) {
+        .then(function(value) {
           expect(value).to.equal('c');
           expect(calledFinally).to.equal(true);
           return Promise.all([
             Promise.resolve('a'),
             Promise.resolve('b')
-          ])
+          ]);
         });
     });
 
diff --git a/spec/integration/issues/issue-275-hyperlink-query-param.spec.js b/spec/integration/issues/issue-275-hyperlink-query-param.spec.js
index 20629b018..7899542e7 100644
--- a/spec/integration/issues/issue-275-hyperlink-query-param.spec.js
+++ b/spec/integration/issues/issue-275-hyperlink-query-param.spec.js
@@ -23,7 +23,7 @@ describe('github issues', function() {
     var ws = wb.addWorksheet('Sheet1');
 
     var hyperlink = {
-      text:'Somewhere with query params',
+      text: 'Somewhere with query params',
       hyperlink: 'www.somewhere.com?a=1&b=2&c=<>&d="\'"'
     };
 
diff --git a/spec/integration/issues/shared-formula.spec.js b/spec/integration/issues/shared-formula.spec.js
index 359ee6e10..8fa9fec6f 100644
--- a/spec/integration/issues/shared-formula.spec.js
+++ b/spec/integration/issues/shared-formula.spec.js
@@ -17,28 +17,28 @@ describe('github issues', function() {
   describe('Shared Formulas', function() {
     describe('issue xyz - cells copied as a block treat formulas as values', function() {
       var explain = 'this fails, although the cells look the same in excel. Both cells are created by copying A3:B3 to A4:F19. The first row in the new block work as espected, the rest only has values (when seen through exceljs)';
-      it('copied cells should have the right formulas', function () {
+      it('copied cells should have the right formulas', function() {
         var wb = new Excel.Workbook();
         return wb.xlsx.readFile('./spec/integration/data/fibonacci.xlsx')
-          .then(function () {
+          .then(function() {
             var ws = wb.getWorksheet('fib');
             expect(ws.getCell('A4').value).to.deep.equal({ formula: 'A3+1', result: 4 });
             expect(ws.getCell('A5').value).to.deep.equal({ sharedFormula: 'A4', result: 5 }, explain);
           });
       });
-      it('copied cells should have the right types', function () {
+      it('copied cells should have the right types', function() {
         var wb = new Excel.Workbook();
         return wb.xlsx.readFile('./spec/integration/data/fibonacci.xlsx')
-          .then(function () {
+          .then(function() {
             var ws = wb.getWorksheet('fib');
             expect(ws.getCell('A4').type).to.equal(Enums.ValueType.Formula);
             expect(ws.getCell('A5').type).to.equal(Enums.ValueType.Formula);
           });
       });
-      it('copied cells should have the same fields', function () { // to see if there are other fields on the object worth comparing
+      it('copied cells should have the same fields', function() { // to see if there are other fields on the object worth comparing
         var wb = new Excel.Workbook();
         return wb.xlsx.readFile('./spec/integration/data/fibonacci.xlsx')
-          .then(function () {
+          .then(function() {
             var ws = wb.getWorksheet('fib');
             var A4 = ws.getCell('A4');
             var A5 = ws.getCell('A5');
diff --git a/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js b/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js
index 16b9885d4..9641c9e9a 100644
--- a/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js
+++ b/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js
@@ -243,7 +243,7 @@ describe('WorkbookWriter', function() {
         });
     });
 
-    it('does not escape special xml characters', function () {
+    it('does not escape special xml characters', function() {
       var wb = new Excel.stream.xlsx.WorkbookWriter({filename: TEST_XLSX_FILE_NAME, useSharedStrings: true});
       var ws = wb.addWorksheet('blort');
       var xmlCharacters = 'xml characters: & < > "';
@@ -263,7 +263,7 @@ describe('WorkbookWriter', function() {
 
     it('serializes and deserializes dataValidations', function() {
       var options = {filename: TEST_XLSX_FILE_NAME};
-      var wb = testUtils.createTestBook(new Excel.stream.xlsx.WorkbookWriter(options),'xlsx', ['dataValidations']);
+      var wb = testUtils.createTestBook(new Excel.stream.xlsx.WorkbookWriter(options), 'xlsx', ['dataValidations']);
 
       return wb.commit()
         .then(function() {
diff --git a/spec/integration/workbook/styles.spec.js b/spec/integration/workbook/styles.spec.js
index f2acd9934..bea1e4e26 100644
--- a/spec/integration/workbook/styles.spec.js
+++ b/spec/integration/workbook/styles.spec.js
@@ -79,7 +79,7 @@ describe('Workbook', function() {
 
       var wb = new Excel.Workbook();
       return wb.xlsx.read(bufferStream)
-          .then(function () {
+          .then(function() {
             var ws = wb.worksheets[0];
             expect(ws.getCell('A1').value).to.deep.equal(richTextSampleA1);
             expect(ws.getCell('A1').text).to.equal(ws.getCell('A2').value);
diff --git a/spec/integration/workbook/workbook.spec.js b/spec/integration/workbook/workbook.spec.js
index 70ab5a034..2f24fad19 100644
--- a/spec/integration/workbook/workbook.spec.js
+++ b/spec/integration/workbook/workbook.spec.js
@@ -64,8 +64,8 @@ describe('Workbook', function() {
       ws.getCell('A1').value = 'World!';
       wb.creator = 'Foo';
       wb.lastModifiedBy = 'Bar';
-      wb.created = new Date(2016,0,1);
-      wb.modified = new Date(2016,4,19);
+      wb.created = new Date(2016, 0, 1);
+      wb.modified = new Date(2016, 4, 19);
       return wb.xlsx.writeFile(TEST_XLSX_FILE_NAME)
         .then(function() {
           var wb2 = new Excel.Workbook();
@@ -82,7 +82,7 @@ describe('Workbook', function() {
     it('shared formula', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('Hello');
-      ws.fillFormula('A1:B2', 'ROW()+COLUMN()', [[2,3],[3,4]]);
+      ws.fillFormula('A1:B2', 'ROW()+COLUMN()', [[2, 3], [3, 4]]);
       return wb.xlsx.writeFile(TEST_XLSX_FILE_NAME)
         .then(function() {
           var wb2 = new Excel.Workbook();
@@ -165,7 +165,7 @@ describe('Workbook', function() {
       var ws = wb.addWorksheet('Hello');
       ws.getCell('A1').value = 'World!';
       wb.language = 'Klingon';
-      wb.revision = new Date(Date.UTC(2016,10,1,12));
+      wb.revision = new Date(Date.UTC(2016, 10, 1, 12));
       wb.contentStauts = 'Final';
       return wb.xlsx.writeFile(TEST_XLSX_FILE_NAME)
         .then(function() {
@@ -373,7 +373,7 @@ describe('Workbook', function() {
           rangeCheck('amigos', ['blort!$A$3:$C$3']);
           rangeCheck('verts', ['blort!$E$1:$E$3']);
           rangeCheck('squares', ['blort!$B$5:$C$6']);
-          rangeCheck('sheets', ['blort!$B$7','foo!$B$7']);
+          rangeCheck('sheets', ['blort!$B$7', 'foo!$B$7']);
           rangeCheck('thing1', ['blort!$G$1']);
           rangeCheck('thing2', ['blort!$G$1']);
           rangeCheck('once', []);
@@ -484,11 +484,11 @@ describe('Workbook', function() {
     testUtils.createTestBook(wb, 'xlsx', sheets, options);
 
     return wb.xlsx.writeFile(TEST_XLSX_FILE_NAME)
-      .then(function () {
+      .then(function() {
         var wb2 = new Excel.Workbook();
         return wb2.xlsx.readFile(TEST_XLSX_FILE_NAME);
       })
-      .then(function (wb2) {
+      .then(function(wb2) {
         testUtils.checkTestBook(wb2, 'xlsx', sheets, options);
       });
   });
@@ -530,9 +530,9 @@ describe('Workbook', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('frozen');
       ws.views = [
-        {state: 'frozen',xSplit: 2,ySplit: 3,topLeftCell: 'C4',activeCell: 'D5'},
-        {state: 'frozen',ySplit: 1},
-        {state: 'frozen',xSplit: 1}
+        {state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5'},
+        {state: 'frozen', ySplit: 1},
+        {state: 'frozen', xSplit: 1}
       ];
       ws.getCell('A1').value = 'Let it Snow!';
 
@@ -558,7 +558,7 @@ describe('Workbook', function() {
               workbookViewId: 0, state: 'frozen', xSplit: 1, ySplit: 0, topLeftCell: 'B1',
               showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             }
-          ])
+          ]);
         });
     });
 
@@ -566,9 +566,9 @@ describe('Workbook', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('split');
       ws.views = [
-        {state: 'split',xSplit: 2000,ySplit: 3000,topLeftCell: 'C4',activeCell: 'D5', activePane: 'bottomRight'},
-        {state: 'split',ySplit: 1500, activePane: 'bottomLeft', topLeftCell: 'A10'},
-        {state: 'split',xSplit: 1500, activePane: 'topRight'}
+        {state: 'split', xSplit: 2000, ySplit: 3000, topLeftCell: 'C4', activeCell: 'D5', activePane: 'bottomRight'},
+        {state: 'split', ySplit: 1500, activePane: 'bottomLeft', topLeftCell: 'A10'},
+        {state: 'split', xSplit: 1500, activePane: 'topRight'}
       ];
       ws.getCell('A1').value = 'Do the splits!';
   
@@ -594,7 +594,7 @@ describe('Workbook', function() {
               workbookViewId: 0, state: 'split', xSplit: 1500, ySplit: 0, topLeftCell: undefined, activePane: 'topRight',
               showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100
             }
-          ])
+          ]);
         });
     });
 
@@ -612,11 +612,11 @@ describe('Workbook', function() {
       ws2.views = [testUtils.views.sheet.split];
   
       return wb.xlsx.writeFile(TEST_XLSX_FILE_NAME)
-        .then(function () {
+        .then(function() {
           var wb2 = new Excel.Workbook();
           return wb2.xlsx.readFile(TEST_XLSX_FILE_NAME);
         })
-        .then(function (wb2) {
+        .then(function(wb2) {
           expect(wb2.views).to.deep.equal(wb.views);
   
           var ws1b = wb2.getWorksheet('one');
diff --git a/spec/integration/worksheet-xlsx-writer.spec.js b/spec/integration/worksheet-xlsx-writer.spec.js
index 5512b9ea1..8df33eb1e 100644
--- a/spec/integration/worksheet-xlsx-writer.spec.js
+++ b/spec/integration/worksheet-xlsx-writer.spec.js
@@ -33,7 +33,7 @@ describe('WorksheetWriter', function() {
       ws.getCell('E1').value = ['Hello', 'World'].join(', ') + '!';
 
       // hyperlink
-      ws.getCell('F1').value = {text: 'www.google.com', hyperlink:'http://www.google.com'};
+      ws.getCell('F1').value = {text: 'www.google.com', hyperlink: 'http://www.google.com'};
 
       // number formula
       ws.getCell('A2').value = {formula: 'A1', result: 7};
@@ -98,7 +98,7 @@ describe('WorksheetWriter', function() {
       ws.getCell('D1').value = new Date();
 
       // hyperlink
-      ws.getCell('E1').value = {text: 'www.google.com', hyperlink:'http://www.google.com'};
+      ws.getCell('E1').value = {text: 'www.google.com', hyperlink: 'http://www.google.com'};
 
       // number formula
       ws.getCell('A2').value = {formula: 'A1', result: 7};
@@ -226,11 +226,11 @@ describe('WorksheetWriter', function() {
         { header: 'D.O.B.', key: 'dob', width: 10 }
       ];
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
 
-      ws.addRow({id:1, name: 'John Doe', dob: dateValue1});
-      ws.addRow({id:2, name: 'Jane Doe', dob: dateValue2});
+      ws.addRow({id: 1, name: 'John Doe', dob: dateValue1});
+      ws.addRow({id: 2, name: 'Jane Doe', dob: dateValue2});
 
       expect(ws.getCell('A2').value).to.equal(1);
       expect(ws.getCell('B2').value).to.equal('John Doe');
@@ -240,16 +240,16 @@ describe('WorksheetWriter', function() {
       expect(ws.getCell('B3').value).to.equal('Jane Doe');
       expect(ws.getCell('C3').value).to.equal(dateValue2);
 
-      expect(ws.getRow(2).values).to.deep.equal([,1,'John Doe', dateValue1]);
-      expect(ws.getRow(3).values).to.deep.equal([,2,'Jane Doe', dateValue2]);
+      expect(ws.getRow(2).values).to.deep.equal([, 1, 'John Doe', dateValue1]);
+      expect(ws.getRow(3).values).to.deep.equal([, 2, 'Jane Doe', dateValue2]);
     });
 
     it('adds rows by contiguous array', function() {
       var wb = new Excel.stream.xlsx.WorkbookWriter();
       var ws = wb.addWorksheet('blort');
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
 
       ws.addRow([1, 'John Doe', dateValue1]);
       ws.addRow([2, 'Jane Doe', dateValue2]);
@@ -262,19 +262,19 @@ describe('WorksheetWriter', function() {
       expect(ws.getCell('B2').value).to.equal('Jane Doe');
       expect(ws.getCell('C2').value).to.equal(dateValue2);
 
-      expect(ws.getRow(1).values).to.deep.equal([,1,'John Doe', dateValue1]);
-      expect(ws.getRow(2).values).to.deep.equal([,2,'Jane Doe', dateValue2]);
+      expect(ws.getRow(1).values).to.deep.equal([, 1, 'John Doe', dateValue1]);
+      expect(ws.getRow(2).values).to.deep.equal([, 2, 'Jane Doe', dateValue2]);
     });
 
     it('adds rows by sparse array', function() {
       var wb = new Excel.stream.xlsx.WorkbookWriter();
       var ws = wb.addWorksheet('blort');
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
       var rows = [,
-        [,1, 'John Doe', ,dateValue1],
-        [,2, 'Jane Doe', ,dateValue2]
+        [, 1, 'John Doe', , dateValue1],
+        [, 2, 'Jane Doe', , dateValue2]
       ];
       var row3 = [];
       row3[1] = 3;
diff --git a/spec/integration/worksheet.spec.js b/spec/integration/worksheet.spec.js
index 62c663fbd..986d11773 100644
--- a/spec/integration/worksheet.spec.js
+++ b/spec/integration/worksheet.spec.js
@@ -32,7 +32,7 @@ describe('Worksheet', function() {
       ws.getCell('E1').value = ['Hello', 'World'].join(', ') + '!';
 
       // hyperlink
-      ws.getCell('F1').value = {text: 'www.google.com', hyperlink:'http://www.google.com'};
+      ws.getCell('F1').value = {text: 'www.google.com', hyperlink: 'http://www.google.com'};
 
       // number formula
       ws.getCell('A2').value = {formula: 'A1', result: 7};
@@ -97,7 +97,7 @@ describe('Worksheet', function() {
       ws.getCell('D1').value = new Date();
 
       // hyperlink
-      ws.getCell('E1').value = {text: 'www.google.com', hyperlink:'http://www.google.com'};
+      ws.getCell('E1').value = {text: 'www.google.com', hyperlink: 'http://www.google.com'};
 
       // number formula
       ws.getCell('A2').value = {formula: 'A1', result: 7};
@@ -225,11 +225,11 @@ describe('Worksheet', function() {
         { header: 'D.O.B.', key: 'dob', width: 10 }
       ];
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
 
-      ws.addRow({id:1, name: 'John Doe', dob: dateValue1});
-      ws.addRow({id:2, name: 'Jane Doe', dob: dateValue2});
+      ws.addRow({id: 1, name: 'John Doe', dob: dateValue1});
+      ws.addRow({id: 2, name: 'Jane Doe', dob: dateValue2});
 
       expect(ws.getCell('A2').value).to.equal(1);
       expect(ws.getCell('B2').value).to.equal('John Doe');
@@ -239,8 +239,8 @@ describe('Worksheet', function() {
       expect(ws.getCell('B3').value).to.equal('Jane Doe');
       expect(ws.getCell('C3').value).to.equal(dateValue2);
 
-      expect(ws.getRow(2).values).to.deep.equal([,1,'John Doe', dateValue1]);
-      expect(ws.getRow(3).values).to.deep.equal([,2,'Jane Doe', dateValue2]);
+      expect(ws.getRow(2).values).to.deep.equal([, 1, 'John Doe', dateValue1]);
+      expect(ws.getRow(3).values).to.deep.equal([, 2, 'Jane Doe', dateValue2]);
 
       var values = [,
         [, 'Id', 'Name', 'D.O.B.'],
@@ -259,8 +259,8 @@ describe('Worksheet', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('blort');
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
 
       ws.addRow([1, 'John Doe', dateValue1]);
       ws.addRow([2, 'Jane Doe', dateValue2]);
@@ -273,19 +273,19 @@ describe('Worksheet', function() {
       expect(ws.getCell('B2').value).to.equal('Jane Doe');
       expect(ws.getCell('C2').value).to.equal(dateValue2);
 
-      expect(ws.getRow(1).values).to.deep.equal([,1,'John Doe', dateValue1]);
-      expect(ws.getRow(2).values).to.deep.equal([,2,'Jane Doe', dateValue2]);
+      expect(ws.getRow(1).values).to.deep.equal([, 1, 'John Doe', dateValue1]);
+      expect(ws.getRow(2).values).to.deep.equal([, 2, 'Jane Doe', dateValue2]);
     });
 
     it('adds rows by sparse array', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('blort');
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
       var rows = [,
-        [,1, 'John Doe', ,dateValue1],
-        [,2, 'Jane Doe', ,dateValue2]
+        [, 1, 'John Doe', , dateValue1],
+        [, 2, 'Jane Doe', , dateValue2]
       ];
       var row3 = [];
       row3[1] = 3;
@@ -375,10 +375,10 @@ describe('Worksheet', function() {
     ws.getCell('A4').value = 'end';
 
     expect(ws.getSheetValues()).to.deep.equal([,
-      [,11,,'C1'],
-      [,21,'B2'],
+      [, 11,, 'C1'],
+      [, 21, 'B2'],
       , // eslint-disable-line comma-style
-      [,'end']
+      [, 'end']
     ]);
   });
 
@@ -518,7 +518,7 @@ describe('Worksheet', function() {
         var d = new Range(range);
         for (var i = d.top; i <= d.bottom; i++) {
           for (var j = d.left; j <= d.right; j++) {
-            var cell = ws.getCell(i,j);
+            var cell = ws.getCell(i, j);
             var masterCell = master ? ws.getCell(master) : cell;
             expect(cell.master.address).to.equal(masterCell.address);
           }
diff --git a/spec/manual/app.js b/spec/manual/app.js
index 5ad56ce51..59a202210 100644
--- a/spec/manual/app.js
+++ b/spec/manual/app.js
@@ -5,7 +5,7 @@
 var fs = require('fs');
 var express = require('express');
 var ExcelJS = require('../../excel');
-var StreamBuf = require('../../lib/utils/stream-buf')
+var StreamBuf = require('../../lib/utils/stream-buf');
 var path = require('path');
 
 console.log('Copying bundle.js to public folder');
diff --git a/spec/unit/doc/cell.spec.js b/spec/unit/doc/cell.spec.js
index 557d4768d..a706660c9 100644
--- a/spec/unit/doc/cell.spec.js
+++ b/spec/unit/doc/cell.spec.js
@@ -68,7 +68,7 @@ var sheetMock = {
 var fonts = {
   arialBlackUI14: { name: 'Arial Black', family: 2, size: 14, underline: true, italic: true },
   comicSansUdB16: { name: 'Comic Sans MS', family: 4, size: 16, underline: 'double', bold: true },
-  broadwayRedOutline20: { name: 'Broadway', family: 5, size: 20, outline: true, color: { argb:'FFFF0000'}}
+  broadwayRedOutline20: { name: 'Broadway', family: 5, size: 20, outline: true, color: { argb: 'FFFF0000'}}
 };
 
 describe('Cell', function() {
@@ -76,7 +76,7 @@ describe('Cell', function() {
     sheetMock.reset();
   });
   it('stores values', function() {
-    var row = sheetMock.getRow(1)
+    var row = sheetMock.getRow(1);
     var column = sheetMock.getColumn(1);
 
     var a1 = sheetMock.getCell('A1');
@@ -119,11 +119,11 @@ describe('Cell', function() {
     expect(a1.value = null).to.be.null();
     expect(a1.type).to.equal(Enums.ValueType.Null);
 
-    expect(a1.value = {json:'data'}).to.deep.equal({json:'data'});
+    expect(a1.value = {json: 'data'}).to.deep.equal({json: 'data'});
     expect(a1.type).to.equal(Enums.ValueType.String);
   });
   it('validates options on construction', function() {
-    var row = sheetMock.getRow(1)
+    var row = sheetMock.getRow(1);
     var column = sheetMock.getColumn(1);
 
     expect(function() { new Cell(); }).to.throw(Error);
@@ -173,7 +173,7 @@ describe('Cell', function() {
   });
 
   it('upgrades from string to hyperlink', function() {
-    var row = sheetMock.getRow(1)
+    var row = sheetMock.getRow(1);
     var column = sheetMock.getColumn(1);
 
     var a1 = sheetMock.getCell('A1');
@@ -189,7 +189,7 @@ describe('Cell', function() {
   });
 
   it('doesn\'t upgrade from non-string to hyperlink', function() {
-    var row = sheetMock.getRow(1)
+    var row = sheetMock.getRow(1);
     var column = sheetMock.getColumn(1);
 
     var a1 = sheetMock.getCell('A1');
@@ -225,7 +225,7 @@ describe('Cell', function() {
   });
 
   it('inherits column styles', function() {
-    var row = sheetMock.getRow(1)
+    var row = sheetMock.getRow(1);
     var column = sheetMock.getColumn(1);
 
     column.style = {
@@ -237,7 +237,7 @@ describe('Cell', function() {
   });
 
   it('inherits row styles', function() {
-    var row = sheetMock.getRow(1)
+    var row = sheetMock.getRow(1);
     var column = sheetMock.getColumn(1);
 
     row.style = {
@@ -249,7 +249,7 @@ describe('Cell', function() {
   });
 
   it('has effective types', function() {
-    var row = sheetMock.getRow(1)
+    var row = sheetMock.getRow(1);
     var column = sheetMock.getColumn(1);
 
     var a1 = sheetMock.getCell('A1');
diff --git a/spec/unit/doc/column.spec.js b/spec/unit/doc/column.spec.js
index e7e28cb0e..20984df36 100644
--- a/spec/unit/doc/column.spec.js
+++ b/spec/unit/doc/column.spec.js
@@ -15,11 +15,11 @@ describe('Column', function() {
 
     expect(sheet.getColumn(1).header).to.equal('Col 1');
     expect(sheet.getColumn(1).headers).to.deep.equal(['Col 1']);
-    expect(sheet.getCell(1,1).value).to.equal('Col 1');
+    expect(sheet.getCell(1, 1).value).to.equal('Col 1');
     expect(sheet.getColumn('id1')).to.equal(sheet.getColumn(1));
     
     sheet.getRow(2).values = { id1: 'Hello, World!' };
-    expect(sheet.getCell(2,1).value).to.equal('Hello, World!');
+    expect(sheet.getCell(2, 1).value).to.equal('Hello, World!');
   });
 
   it('maintains properties', function() {
@@ -36,16 +36,16 @@ describe('Column', function() {
     column.header = 'Col 1';
     expect(sheet.getColumn(1).header).to.equal('Col 1');
     expect(sheet.getColumn(1).headers).to.deep.equal(['Col 1']);
-    expect(sheet.getCell(1,1).value).to.equal('Col 1');
+    expect(sheet.getCell(1, 1).value).to.equal('Col 1');
 
-    column.header = ['Col A1','Col A2'];
-    expect(sheet.getColumn(1).header).to.deep.equal(['Col A1','Col A2']);
-    expect(sheet.getColumn(1).headers).to.deep.equal(['Col A1','Col A2']);
-    expect(sheet.getCell(1,1).value).to.equal('Col A1');
-    expect(sheet.getCell(2,1).value).to.equal('Col A2');
+    column.header = ['Col A1', 'Col A2'];
+    expect(sheet.getColumn(1).header).to.deep.equal(['Col A1', 'Col A2']);
+    expect(sheet.getColumn(1).headers).to.deep.equal(['Col A1', 'Col A2']);
+    expect(sheet.getCell(1, 1).value).to.equal('Col A1');
+    expect(sheet.getCell(2, 1).value).to.equal('Col A2');
 
     sheet.getRow(3).values = { id1: 'Hello, World!' };
-    expect(sheet.getCell(3,1).value).to.equal('Hello, World!');
+    expect(sheet.getCell(3, 1).value).to.equal('Hello, World!');
   });
 
   it('creates model', function() {
diff --git a/spec/unit/doc/defined-names.spec.js b/spec/unit/doc/defined-names.spec.js
index e3bb2afb3..ea960c2fa 100644
--- a/spec/unit/doc/defined-names.spec.js
+++ b/spec/unit/doc/defined-names.spec.js
@@ -8,26 +8,26 @@ describe('DefinedNames', function() {
   it('adds names for cells', function() {
     var dn = new DefinedNames();
 
-    dn.add('blort!A1','foo');
+    dn.add('blort!A1', 'foo');
     expect(dn.getNames('blort!A1')).to.deep.equal(['foo']);
     expect(dn.getNames('blort!$A$1')).to.deep.equal(['foo']);
 
-    dn.add('blort!$B$4','bar');
+    dn.add('blort!$B$4', 'bar');
     expect(dn.getNames('blort!B4')).to.deep.equal(['bar']);
     expect(dn.getNames('blort!$B$4')).to.deep.equal(['bar']);
 
-    dn.add("'blo rt'!$B$4",'bar');
+    dn.add("'blo rt'!$B$4", 'bar');
     expect(dn.getNames("'blo rt'!$B$4")).to.deep.equal(['bar']);
-    dn.add("'blo ,!rt'!$B$4",'bar');
+    dn.add("'blo ,!rt'!$B$4", 'bar');
     expect(dn.getNames("'blo ,!rt'!$B$4")).to.deep.equal(['bar']);
   });
 
   it('removes names for cells', function() {
     var dn = new DefinedNames();
 
-    dn.add('blort!A1','foo');
-    dn.add('blort!A1','bar');
-    dn.remove('blort!A1','foo');
+    dn.add('blort!A1', 'foo');
+    dn.add('blort!A1', 'bar');
+    dn.remove('blort!A1', 'foo');
 
     expect(dn.getNames('blort!A1')).to.deep.equal(['bar']);
   });
@@ -61,8 +61,8 @@ describe('DefinedNames', function() {
     var dn = new DefinedNames();
 
     dn.model = [];
-    dn.add('blort!A1','bar');
-    dn.remove('blort!A1','foo');
+    dn.add('blort!A1', 'bar');
+    dn.remove('blort!A1', 'foo');
 
     expect(dn.getNames('blort!A1')).to.deep.equal(['bar']);
   });
diff --git a/spec/unit/doc/range.spec.js b/spec/unit/doc/range.spec.js
index d59292c0b..f9b52a868 100644
--- a/spec/unit/doc/range.spec.js
+++ b/spec/unit/doc/range.spec.js
@@ -31,10 +31,10 @@ describe('Range', function() {
     check(new Range('D5:B10'), 'B5:D10', '$B$5:$D$10', 'B5', '$B$5', 'D10', '$D$10', 5, 2, 10, 4);
     check(new Range('D10:B5'), 'B5:D10', '$B$5:$D$10', 'B5', '$B$5', 'D10', '$D$10', 5, 2, 10, 4);
 
-    check(new Range('G7','C16'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
-    check(new Range('C7','G16'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
-    check(new Range('C16','G7'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
-    check(new Range('G16','C7'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
+    check(new Range('G7', 'C16'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
+    check(new Range('C7', 'G16'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
+    check(new Range('C16', 'G7'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
+    check(new Range('G16', 'C7'), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
 
     check(new Range(7, 3, 16, 7), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
     check(new Range(16, 3, 7, 7), 'C7:G16', '$C$7:$G$16', 'C7', '$C$7', 'G16', '$G$16', 7, 3, 16, 7);
@@ -54,12 +54,12 @@ describe('Range', function() {
   it('expands properly', function() {
     var d = new Range();
 
-    d.expand(1,1,1,3);
+    d.expand(1, 1, 1, 3);
     expect(d.tl).to.equal('A1');
     expect(d.br).to.equal('C1');
     expect(d.toString()).to.equal('A1:C1');
 
-    d.expand(1,3,3,3);
+    d.expand(1, 3, 3, 3);
     expect(d.tl).to.equal('A1');
     expect(d.br).to.equal('C3');
     expect(d.toString()).to.equal('A1:C3');
@@ -68,7 +68,7 @@ describe('Range', function() {
   it('doesn\'t always include the default row/col', function() {
     var d = new Range();
 
-    d.expand(2,2,4,4);
+    d.expand(2, 2, 4, 4);
     expect(d.tl).to.equal('B2');
     expect(d.br).to.equal('D4');
     expect(d.toString()).to.equal('B2:D4');
diff --git a/spec/unit/doc/row.spec.js b/spec/unit/doc/row.spec.js
index 0cbe46d74..7897edf0a 100644
--- a/spec/unit/doc/row.spec.js
+++ b/spec/unit/doc/row.spec.js
@@ -31,16 +31,16 @@ describe('Row', function() {
 
     b1.value = 'Hello, World!';
     var d1 = row1.getCell(4);
-    d1.value = { hyperlink:'http://www.hyperlink.com', text: 'www.hyperlink.com' };
+    d1.value = { hyperlink: 'http://www.hyperlink.com', text: 'www.hyperlink.com' };
 
-    var values = [,5,'Hello, World!',,{hyperlink:'http://www.hyperlink.com', text: 'www.hyperlink.com'}];
+    var values = [, 5, 'Hello, World!',, {hyperlink: 'http://www.hyperlink.com', text: 'www.hyperlink.com'}];
     expect(row1.values).to.deep.equal(values);
-    expect(row1.dimensions).to.deep.equal({min:1,max:4});
+    expect(row1.dimensions).to.deep.equal({min: 1, max: 4});
 
     var count = 0;
     row1.eachCell(function(cell, colNumber) {
       expect(cell.type).to.not.equal(Enums.ValueType.Null);
-      switch(cell.type) {
+      switch (cell.type) {
         case Enums.ValueType.Hyperlink:
           expect(cell.value).to.deep.equal(values[colNumber]);
           break;
@@ -55,14 +55,14 @@ describe('Row', function() {
     expect(count).to.equal(3);
 
     var row2 = sheet.getRow(2);
-    expect(row2.dimensions).to.be.null()
+    expect(row2.dimensions).to.be.null();
   });
 
   it('stores values by whole row', function() {
     var sheet = createSheetMock();
-    sheet.addColumn(1, {key:'id'});
-    sheet.addColumn(2, {key:'name'});
-    sheet.addColumn(3, {key:'dob'});
+    sheet.addColumn(1, {key: 'id'});
+    sheet.addColumn(2, {key: 'name'});
+    sheet.addColumn(3, {key: 'dob'});
 
     var now = new Date();
 
@@ -72,7 +72,7 @@ describe('Row', function() {
     row1.values = [5, 'Hello, World!', null];
     expect(row1.getCell(1).value).to.equal(5);
     expect(row1.getCell(2).value).to.equal('Hello, World!');
-    expect(row1.getCell(3).value).to.be.null()
+    expect(row1.getCell(3).value).to.be.null();
     expect(row1.values).to.deep.equal([, 5, 'Hello, World!']);
 
     // set values by sparse array
@@ -82,7 +82,7 @@ describe('Row', function() {
     values[5] = now;
     row1.values = values;
     expect(row1.getCell(1).value).to.equal(7);
-    expect(row1.getCell(2).value).to.be.null()
+    expect(row1.getCell(2).value).to.be.null();
     expect(row1.getCell(3).value).to.equal('Not Null!');
     expect(row1.getCell(5).type).to.equal(Enums.ValueType.Date);
     expect(row1.values).to.deep.equal([, 7, , 'Not Null!', , now]);
@@ -96,7 +96,7 @@ describe('Row', function() {
     expect(row1.getCell(1).value).to.equal(9);
     expect(row1.getCell(2).value).to.equal('Dobbie');
     expect(row1.getCell(3).type).to.equal(Enums.ValueType.Date);
-    expect(row1.getCell(5).value).to.be.null()
+    expect(row1.getCell(5).value).to.be.null();
     expect(row1.values).to.deep.equal([, 9, 'Dobbie', now]);
   });
 
@@ -112,7 +112,7 @@ describe('Row', function() {
       row.getCell(11).value = 'eleven';
       row.getCell(13).value = 13;
 
-      row.splice(3,3);
+      row.splice(3, 3);
       expect(row.getCell(2).value).to.equal(2);
       expect(row.getCell(2).type).to.equal(Enums.ValueType.Number);
       expect(row.getCell(2).address).to.equal('B1');
@@ -127,25 +127,25 @@ describe('Row', function() {
     it('remove and insert fewer', function() {
       var sheet = createSheetMock();
       var row = sheet.getRow(1);
-      row.values = [1,2,3,4,5,6,7,8];
-      row.splice(4,3,'four','five');
-      expect(row.values).to.deep.equal([,1,2,3,'four', 'five', 7, 8]);
+      row.values = [1, 2, 3, 4, 5, 6, 7, 8];
+      row.splice(4, 3, 'four', 'five');
+      expect(row.values).to.deep.equal([, 1, 2, 3, 'four', 'five', 7, 8]);
     });
 
     it('remove and insert replacements', function() {
       var sheet = createSheetMock();
       var row = sheet.getRow(1);
-      row.values = [1,2,3,4,5,6,7,8];
-      row.splice(4,3,'four','five','six');
-      expect(row.values).to.deep.equal([,1,2,3,'four', 'five', 'six', 7, 8]);
+      row.values = [1, 2, 3, 4, 5, 6, 7, 8];
+      row.splice(4, 3, 'four', 'five', 'six');
+      expect(row.values).to.deep.equal([, 1, 2, 3, 'four', 'five', 'six', 7, 8]);
     });
 
     it('remove and insert more', function() {
       var sheet = createSheetMock();
       var row = sheet.getRow(1);
-      row.values = [1,2,3,4,5,6,7,8];
-      row.splice(4,3,'four','five','six','six and a half');
-      expect(row.values).to.deep.equal([,1,2,3,'four', 'five', 'six', 'six and a half', 7, 8]);
+      row.values = [1, 2, 3, 4, 5, 6, 7, 8];
+      row.splice(4, 3, 'four', 'five', 'six', 'six and a half');
+      expect(row.values).to.deep.equal([, 1, 2, 3, 'four', 'five', 'six', 'six and a half', 7, 8]);
     });
   });
 
@@ -175,16 +175,16 @@ describe('Row', function() {
     var row1 = sheet.getRow(1);
     row1.getCell(1).value = 5;
     row1.getCell(2).value = 'Hello, World!';
-    row1.getCell(4).value = { hyperlink:'http://www.hyperlink.com', text: 'www.hyperlink.com' };
+    row1.getCell(4).value = { hyperlink: 'http://www.hyperlink.com', text: 'www.hyperlink.com' };
     row1.getCell(5).value = null;
     row1.height = 50;
 
     expect(row1.model).to.deep.equal({
-      cells:[
-        {address:'A1',type:Enums.ValueType.Number,value:5,style:{}},
-        {address:'B1',type:Enums.ValueType.String,value:'Hello, World!',style:{}},
-        {address:'D1',type:Enums.ValueType.Hyperlink,text:'www.hyperlink.com',hyperlink:'http://www.hyperlink.com',style:{}},
-        {address:'E1',type:Enums.ValueType.Null,style:{}}
+      cells: [
+        {address: 'A1', type: Enums.ValueType.Number, value: 5, style: {}},
+        {address: 'B1', type: Enums.ValueType.String, value: 'Hello, World!', style: {}},
+        {address: 'D1', type: Enums.ValueType.Hyperlink, text: 'www.hyperlink.com', hyperlink: 'http://www.hyperlink.com', style: {}},
+        {address: 'E1', type: Enums.ValueType.Null, style: {}}
       ],
       number: 1,
       min: 1,
@@ -203,7 +203,7 @@ describe('Row', function() {
     row3.getCell(1).value = 5;
     row3.outlineLevel = 1;
     expect(row3.model).to.deep.equal({
-      cells:[{address:'A3',type:Enums.ValueType.Number,value:5,style:{}}],
+      cells: [{address: 'A3', type: Enums.ValueType.Number, value: 5, style: {}}],
       number: 3,
       min: 1,
       max: 1,
@@ -212,17 +212,17 @@ describe('Row', function() {
       style: {},
       outlineLevel: 1,
       collapsed: true
-    })
+    });
   });
 
   it('builds from model', function() {
     var sheet = createSheetMock();
     var row1 = sheet.getRow(1);
     row1.model = {
-      cells:[
-        {address:'A1',type:Enums.ValueType.Number,value:5},
-        {address:'B1',type:Enums.ValueType.String,value:'Hello, World!'},
-        {address:'D1',type:Enums.ValueType.Hyperlink,text:'www.hyperlink.com',hyperlink:'http://www.hyperlink.com'}
+      cells: [
+        {address: 'A1', type: Enums.ValueType.Number, value: 5},
+        {address: 'B1', type: Enums.ValueType.String, value: 'Hello, World!'},
+        {address: 'D1', type: Enums.ValueType.Hyperlink, text: 'www.hyperlink.com', hyperlink: 'http://www.hyperlink.com'}
       ],
       number: 1,
       min: 1,
@@ -230,14 +230,14 @@ describe('Row', function() {
       height: 32.5
     };
 
-    expect(row1.dimensions).to.deep.equal({min:1,max:4});
-    expect(row1.values).to.deep.equal([,5,'Hello, World!', , {hyperlink:'http://www.hyperlink.com', text: 'www.hyperlink.com'}]);
+    expect(row1.dimensions).to.deep.equal({min: 1, max: 4});
+    expect(row1.values).to.deep.equal([, 5, 'Hello, World!', , {hyperlink: 'http://www.hyperlink.com', text: 'www.hyperlink.com'}]);
     expect(row1.getCell(1).type).to.equal(Enums.ValueType.Number);
     expect(row1.getCell(1).value).to.equal(5);
     expect(row1.getCell(2).type).to.equal(Enums.ValueType.String);
     expect(row1.getCell(2).value).to.equal('Hello, World!');
     expect(row1.getCell(4).type).to.equal(Enums.ValueType.Hyperlink);
-    expect(row1.getCell(4).value).to.deep.equal({hyperlink:'http://www.hyperlink.com', text: 'www.hyperlink.com'});
+    expect(row1.getCell(4).value).to.deep.equal({hyperlink: 'http://www.hyperlink.com', text: 'www.hyperlink.com'});
     expect(row1.getCell(5).type).to.equal(Enums.ValueType.Null);
     expect(row1.height - 32.5).to.be.below(0.00000001);
   });
diff --git a/spec/unit/doc/workbook.spec.js b/spec/unit/doc/workbook.spec.js
index 52f8892c1..450a646ad 100644
--- a/spec/unit/doc/workbook.spec.js
+++ b/spec/unit/doc/workbook.spec.js
@@ -28,7 +28,7 @@ function createSimpleWorkbook() {
   ws.getCell('D1').value = new Date();
 
   // hyperlink
-  ws.getCell('E1').value = {text: 'www.google.com', hyperlink:'http://www.google.com'};
+  ws.getCell('E1').value = {text: 'www.google.com', hyperlink: 'http://www.google.com'};
 
   // number formula
   ws.getCell('A2').value = {formula: 'A1', result: 7};
@@ -87,14 +87,14 @@ describe('Workbook', function() {
     var ws = wb.addWorksheet('blort');
     ws.getCell('A1').value = {
       'richText': [
-        {'font': {'size': 12,'color': {'theme': 0},'name': 'Calibri','family': 2,'scheme': 'minor'},'text': 'This is '},
-        {'font': {'italic': true,'size': 12,'color': {'theme': 0},'name': 'Calibri','scheme': 'minor'},'text': 'a'},
-        {'font': {'size': 12,'color': {'theme': 1},'name': 'Calibri','family': 2,'scheme': 'minor'},'text': ' '},
-        {'font': {'size': 12,'color': {'argb': 'FFFF6600'},'name': 'Calibri','scheme': 'minor'},'text': 'colorful'},
-        {'font': {'size': 12,'color': {'theme': 1},'name': 'Calibri','family': 2,'scheme': 'minor'},'text': ' text '},
-        {'font': {'size': 12,'color': {'argb': 'FFCCFFCC'},'name': 'Calibri','scheme': 'minor'},'text': 'with'},
-        {'font': {'size': 12,'color': {'theme': 1},'name': 'Calibri','family': 2,'scheme': 'minor'},'text': ' in-cell '},
-        {'font': {'bold': true,'size': 12,'color': {'theme': 1},'name': 'Calibri','family': 2,'scheme': 'minor'},'text': 'format'}
+        {'font': {'size': 12, 'color': {'theme': 0}, 'name': 'Calibri', 'family': 2, 'scheme': 'minor'}, 'text': 'This is '},
+        {'font': {'italic': true, 'size': 12, 'color': {'theme': 0}, 'name': 'Calibri', 'scheme': 'minor'}, 'text': 'a'},
+        {'font': {'size': 12, 'color': {'theme': 1}, 'name': 'Calibri', 'family': 2, 'scheme': 'minor'}, 'text': ' '},
+        {'font': {'size': 12, 'color': {'argb': 'FFFF6600'}, 'name': 'Calibri', 'scheme': 'minor'}, 'text': 'colorful'},
+        {'font': {'size': 12, 'color': {'theme': 1}, 'name': 'Calibri', 'family': 2, 'scheme': 'minor'}, 'text': ' text '},
+        {'font': {'size': 12, 'color': {'argb': 'FFCCFFCC'}, 'name': 'Calibri', 'scheme': 'minor'}, 'text': 'with'},
+        {'font': {'size': 12, 'color': {'theme': 1}, 'name': 'Calibri', 'family': 2, 'scheme': 'minor'}, 'text': ' in-cell '},
+        {'font': {'bold': true, 'size': 12, 'color': {'theme': 1}, 'name': 'Calibri', 'family': 2, 'scheme': 'minor'}, 'text': 'format'}
       ]
     };
 
diff --git a/spec/unit/doc/worksheet-writer.spec.js b/spec/unit/doc/worksheet-writer.spec.js
index fd868ede6..c13f43bc8 100644
--- a/spec/unit/doc/worksheet-writer.spec.js
+++ b/spec/unit/doc/worksheet-writer.spec.js
@@ -21,8 +21,7 @@ describe('Workbook Writer', function() {
           var xml = mockWorkbook.stream.read().toString();
           expect(xml).xml.to.be.valid();
           resolve();
-        }
-        catch(error) {
+        } catch (error) {
           reject(error);
         }
       });
diff --git a/spec/unit/doc/worksheet.merge.spec.js b/spec/unit/doc/worksheet.merge.spec.js
index 15fa5cfcb..3746ad847 100644
--- a/spec/unit/doc/worksheet.merge.spec.js
+++ b/spec/unit/doc/worksheet.merge.spec.js
@@ -53,7 +53,7 @@ describe('Worksheet', function() {
         var d = new Dimensions(range);
         for (var i = d.top; i <= d.bottom; i++) {
           for (var j = d.left; j <= d.right; j++) {
-            var cell = ws.getCell(i,j);
+            var cell = ws.getCell(i, j);
             var masterCell = master ? ws.getCell(master) : cell;
             expect(cell.master.address).to.equal(masterCell.address);
           }
diff --git a/spec/unit/doc/worksheet.shared-formula.spec.js b/spec/unit/doc/worksheet.shared-formula.spec.js
index bb7c18378..2460dbeb7 100644
--- a/spec/unit/doc/worksheet.shared-formula.spec.js
+++ b/spec/unit/doc/worksheet.shared-formula.spec.js
@@ -10,7 +10,7 @@ describe('Worksheet', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet();
 
-      ws.fillFormula('A1:B2', 'ROW()+COLUMN()', [[2,3],[3,4]]);
+      ws.fillFormula('A1:B2', 'ROW()+COLUMN()', [[2, 3], [3, 4]]);
       expect(ws.getCell('A1').value).to.deep.equal({ formula: 'ROW()+COLUMN()', result: 2 });
       expect(ws.getCell('B1').value).to.deep.equal({ sharedFormula: 'A1', result: 3 });
       expect(ws.getCell('A2').value).to.deep.equal({ sharedFormula: 'A1', result: 3 });
@@ -20,7 +20,7 @@ describe('Worksheet', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet();
 
-      ws.fillFormula('A1:A4', 'ROW()+COLUMN()', [2,3,4,5]);
+      ws.fillFormula('A1:A4', 'ROW()+COLUMN()', [2, 3, 4, 5]);
       expect(ws.getCell('A1').value).to.deep.equal({ formula: 'ROW()+COLUMN()', result: 2 });
       expect(ws.getCell('A2').value).to.deep.equal({ sharedFormula: 'A1', result: 3 });
       expect(ws.getCell('A3').value).to.deep.equal({ sharedFormula: 'A1', result: 4 });
@@ -30,7 +30,7 @@ describe('Worksheet', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet();
 
-      ws.fillFormula('A1:D1', 'ROW()+COLUMN()', [2,3,4,5]);
+      ws.fillFormula('A1:D1', 'ROW()+COLUMN()', [2, 3, 4, 5]);
       expect(ws.getCell('A1').value).to.deep.equal({ formula: 'ROW()+COLUMN()', result: 2 });
       expect(ws.getCell('B1').value).to.deep.equal({ sharedFormula: 'A1', result: 3 });
       expect(ws.getCell('C1').value).to.deep.equal({ sharedFormula: 'A1', result: 4 });
@@ -40,7 +40,7 @@ describe('Worksheet', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet();
 
-      ws.fillFormula('A1:B2', 'ROW()+COLUMN()', [2,3,3,4]);
+      ws.fillFormula('A1:B2', 'ROW()+COLUMN()', [2, 3, 3, 4]);
       expect(ws.getCell('A1').value).to.deep.equal({ formula: 'ROW()+COLUMN()', result: 2 });
       expect(ws.getCell('B1').value).to.deep.equal({ sharedFormula: 'A1', result: 3 });
       expect(ws.getCell('A2').value).to.deep.equal({ sharedFormula: 'A1', result: 3 });
diff --git a/spec/unit/doc/worksheet.values.spec.js b/spec/unit/doc/worksheet.values.spec.js
index 1dbe6901b..68bb100f2 100644
--- a/spec/unit/doc/worksheet.values.spec.js
+++ b/spec/unit/doc/worksheet.values.spec.js
@@ -29,7 +29,7 @@ describe('Worksheet', function() {
       ws.getCell('E1').value = ['Hello', 'World'].join(', ') + '!';
 
       // hyperlink
-      ws.getCell('F1').value = {text: 'www.google.com', hyperlink:'http://www.google.com'};
+      ws.getCell('F1').value = {text: 'www.google.com', hyperlink: 'http://www.google.com'};
 
       // number formula
       ws.getCell('A2').value = {formula: 'A1', result: 7};
@@ -94,7 +94,7 @@ describe('Worksheet', function() {
       ws.getCell('D1').value = new Date();
 
       // hyperlink
-      ws.getCell('E1').value = {text: 'www.google.com', hyperlink:'http://www.google.com'};
+      ws.getCell('E1').value = {text: 'www.google.com', hyperlink: 'http://www.google.com'};
 
       // number formula
       ws.getCell('A2').value = {formula: 'A1', result: 7};
@@ -222,11 +222,11 @@ describe('Worksheet', function() {
         { header: 'D.O.B.', key: 'dob', width: 10 }
       ];
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
 
-      ws.addRow({id:1, name: 'John Doe', dob: dateValue1});
-      ws.addRow({id:2, name: 'Jane Doe', dob: dateValue2});
+      ws.addRow({id: 1, name: 'John Doe', dob: dateValue1});
+      ws.addRow({id: 2, name: 'Jane Doe', dob: dateValue2});
 
       expect(ws.getCell('A2').value).to.equal(1);
       expect(ws.getCell('B2').value).to.equal('John Doe');
@@ -236,8 +236,8 @@ describe('Worksheet', function() {
       expect(ws.getCell('B3').value).to.equal('Jane Doe');
       expect(ws.getCell('C3').value).to.equal(dateValue2);
 
-      expect(ws.getRow(2).values).to.deep.equal([,1,'John Doe', dateValue1]);
-      expect(ws.getRow(3).values).to.deep.equal([,2,'Jane Doe', dateValue2]);
+      expect(ws.getRow(2).values).to.deep.equal([, 1, 'John Doe', dateValue1]);
+      expect(ws.getRow(3).values).to.deep.equal([, 2, 'Jane Doe', dateValue2]);
 
       var values = [,
         [, 'Id', 'Name', 'D.O.B.'],
@@ -256,8 +256,8 @@ describe('Worksheet', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('blort');
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
 
       ws.addRow([1, 'John Doe', dateValue1]);
       ws.addRow([2, 'Jane Doe', dateValue2]);
@@ -270,19 +270,19 @@ describe('Worksheet', function() {
       expect(ws.getCell('B2').value).to.equal('Jane Doe');
       expect(ws.getCell('C2').value).to.equal(dateValue2);
 
-      expect(ws.getRow(1).values).to.deep.equal([,1,'John Doe', dateValue1]);
-      expect(ws.getRow(2).values).to.deep.equal([,2,'Jane Doe', dateValue2]);
+      expect(ws.getRow(1).values).to.deep.equal([, 1, 'John Doe', dateValue1]);
+      expect(ws.getRow(2).values).to.deep.equal([, 2, 'Jane Doe', dateValue2]);
     });
 
     it('adds rows by sparse array', function() {
       var wb = new Excel.Workbook();
       var ws = wb.addWorksheet('blort');
 
-      var dateValue1 = new Date(1970,1,1);
-      var dateValue2 = new Date(1965,1,7);
+      var dateValue1 = new Date(1970, 1, 1);
+      var dateValue2 = new Date(1965, 1, 7);
       var rows = [,
-        [,1, 'John Doe', ,dateValue1],
-        [,2, 'Jane Doe', ,dateValue2]
+        [, 1, 'John Doe', , dateValue1],
+        [, 2, 'Jane Doe', , dateValue2]
       ];
       var row3 = [];
       row3[1] = 3;
@@ -386,13 +386,13 @@ describe('Worksheet', function() {
             ws.addRow(value);
           });
 
-          ws.spliceColumns(2,1, ['B1', 'B2'], ['C1', 'C2']);
+          ws.spliceColumns(2, 1, ['B1', 'B2'], ['C1', 'C2']);
 
           values.forEach(function(rowValues, index) {
             var row = ws.getRow(index + 1);
             _.each(rowValues, function(value, key) {
               if (key !== 'dob') {
-                expect(row.getCell(key).value).to.equal(value)
+                expect(row.getCell(key).value).to.equal(value);
               }
             });
           });
@@ -458,10 +458,10 @@ describe('Worksheet', function() {
       ws.getCell('A4').value = 'end';
 
       expect(ws.getSheetValues()).to.deep.equal([,
-        [,11,,'C1'],
-        [,21,'B2'],
+        [, 11,, 'C1'],
+        [, 21, 'B2'],
         , // eslint-disable-line comma-style
-        [,'end']
+        [, 'end']
       ]);
     });
 
diff --git a/spec/unit/utils/col-cache.spec.js b/spec/unit/utils/col-cache.spec.js
index aaa295705..fb17124d8 100644
--- a/spec/unit/utils/col-cache.spec.js
+++ b/spec/unit/utils/col-cache.spec.js
@@ -11,7 +11,7 @@ describe('colCache', function() {
     expect(colCache._n2l[1]).to.equal('A');
 
     // also, because of the fill heuristic A-Z will be there too
-    var dic = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'];
+    var dic = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
     dic.forEach(function(letter, index) {
       expect(colCache._l2n[letter]).to.equal(index + 1);
       expect(colCache._n2l[index + 1]).to.equal(letter);
@@ -64,14 +64,14 @@ describe('colCache', function() {
   });
 
   it('decodes addresses', function() {
-    expect(colCache.decodeAddress('A1')).to.deep.equal({address:'A1',col:1, row: 1, $col$row: '$A$1'});
-    expect(colCache.decodeAddress('AA11')).to.deep.equal({address:'AA11',col:27, row: 11, $col$row: '$AA$11'});
+    expect(colCache.decodeAddress('A1')).to.deep.equal({address: 'A1', col: 1, row: 1, $col$row: '$A$1'});
+    expect(colCache.decodeAddress('AA11')).to.deep.equal({address: 'AA11', col: 27, row: 11, $col$row: '$AA$11'});
 
     it('convert [sheetName!][$]col[$]row[[$]col[$]row] into address or range structures', function() {
-      expect(colCache.decodeEx('Sheet1!$H$1')).to.deep.equal({$col$row:'$H$1', address:'H1', col:8, row:1, sheetName:'Sheet1'});
-      expect(colCache.decodeEx("'Sheet 1'!$H$1")).to.deep.equal({$col$row:'$H$1', address:'H1', col:8, row:1, sheetName:'Sheet 1'});
-      expect(colCache.decodeEx("'Sheet !$:1'!$H$1")).to.deep.equal({$col$row:'$H$1', address:'H1', col:8, row:1, sheetName:'Sheet !$:1'});
-      expect(colCache.decodeEx("'Sheet !$:1'!#REF!")).to.deep.equal({sheetName:'Sheet !$:1', error:'#REF!'});
+      expect(colCache.decodeEx('Sheet1!$H$1')).to.deep.equal({$col$row: '$H$1', address: 'H1', col: 8, row: 1, sheetName: 'Sheet1'});
+      expect(colCache.decodeEx("'Sheet 1'!$H$1")).to.deep.equal({$col$row: '$H$1', address: 'H1', col: 8, row: 1, sheetName: 'Sheet 1'});
+      expect(colCache.decodeEx("'Sheet !$:1'!$H$1")).to.deep.equal({$col$row: '$H$1', address: 'H1', col: 8, row: 1, sheetName: 'Sheet !$:1'});
+      expect(colCache.decodeEx("'Sheet !$:1'!#REF!")).to.deep.equal({sheetName: 'Sheet !$:1', error: '#REF!'});
     });
   });
 
@@ -81,20 +81,20 @@ describe('colCache', function() {
     expect(addr.row).to.equal(5);
     expect(addr.col).to.equal(4);
     expect(colCache.getAddress('D5')).to.equal(addr);
-    expect(colCache.getAddress(5,4)).to.equal(addr);
+    expect(colCache.getAddress(5, 4)).to.equal(addr);
 
     addr = colCache.getAddress('E4');
     expect(addr.address).to.equal('E4');
     expect(addr.row).to.equal(4);
     expect(addr.col).to.equal(5);
     expect(colCache.getAddress('E4')).to.equal(addr);
-    expect(colCache.getAddress(4,5)).to.equal(addr);
+    expect(colCache.getAddress(4, 5)).to.equal(addr);
   });
 
   it('decodes addresses and ranges', function() {
     // address
-    expect(colCache.decode('A1')).to.deep.equal({address:'A1',col:1, row: 1, $col$row: '$A$1'});
-    expect(colCache.decode('AA11')).to.deep.equal({address:'AA11',col:27, row: 11, $col$row: '$AA$11'});
+    expect(colCache.decode('A1')).to.deep.equal({address: 'A1', col: 1, row: 1, $col$row: '$A$1'});
+    expect(colCache.decode('AA11')).to.deep.equal({address: 'AA11', col: 27, row: 11, $col$row: '$AA$11'});
 
     // range
     expect(colCache.decode('A1:B2')).to.deep.equal({
diff --git a/spec/unit/utils/stream-buf.spec.js b/spec/unit/utils/stream-buf.spec.js
index f3256f75f..ed272dc86 100644
--- a/spec/unit/utils/stream-buf.spec.js
+++ b/spec/unit/utils/stream-buf.spec.js
@@ -53,6 +53,6 @@ describe('StreamBuf', function() {
       });
       sb.on('error', reject);
       s.pipe(sb);
-    })
+    });
   });
 });
diff --git a/spec/unit/utils/string-buf.spec.js b/spec/unit/utils/string-buf.spec.js
index 40a173bff..019563347 100644
--- a/spec/unit/utils/string-buf.spec.js
+++ b/spec/unit/utils/string-buf.spec.js
@@ -8,14 +8,14 @@ describe('StringBuf', function() {
   // StringBuf is a lightweight string-builder used by the streaming writers to build
   // strings (e.g. for row data) without too many memory operations
   it('writes strings as UTF8', function() {
-    var sb = new StringBuf({size:64});
+    var sb = new StringBuf({size: 64});
     sb.addText('Hello, World!');
     var chunk = sb.toBuffer();
     expect(chunk.toString('UTF8')).to.equal('Hello, World!');
   });
 
   it('grows properly', function() {
-    var sb = new StringBuf({size:8});
+    var sb = new StringBuf({size: 8});
     expect(sb.length).to.equal(0);
     expect(sb.capacity).to.equal(8);
 
@@ -41,7 +41,7 @@ describe('StringBuf', function() {
   });
 
   it('resets', function() {
-    var sb = new StringBuf({size:64});
+    var sb = new StringBuf({size: 64});
     sb.addText('Hello, ');
     expect(sb.length).to.equal(7);
 
diff --git a/spec/unit/utils/xml-stream.spec.js b/spec/unit/utils/xml-stream.spec.js
index 56e6d3576..60ffcef23 100644
--- a/spec/unit/utils/xml-stream.spec.js
+++ b/spec/unit/utils/xml-stream.spec.js
@@ -56,9 +56,9 @@ describe('XmlStream', function() {
     xmlStream.openNode('root');
     xmlStream.openNode('l1');
     xmlStream.addAttribute('stuff', 'this & that');
-    xmlStream.openNode('l2', {foo:'<bar>'});
+    xmlStream.openNode('l2', {foo: '<bar>'});
     xmlStream.closeNode();
-    xmlStream.leafNode('l2', {quote:'"this"'});
+    xmlStream.leafNode('l2', {quote: '"this"'});
     xmlStream.closeNode();
     xmlStream.closeNode();
     expect(xmlStream.xml).to.equal('<root><l1 stuff="this &amp; that"><l2 foo="&lt;bar&gt;"/><l2 quote="&quot;this&quot;"/></l1></root>');
diff --git a/spec/unit/xlsx/xform/book/defined-name-xform.spec.js b/spec/unit/xlsx/xform/book/defined-name-xform.spec.js
index 665bad394..752d09106 100644
--- a/spec/unit/xlsx/xform/book/defined-name-xform.spec.js
+++ b/spec/unit/xlsx/xform/book/defined-name-xform.spec.js
@@ -7,22 +7,22 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Defined Names',
-    create:  function() { return new DefinedNameXform()},
-    preparedModel: {name: 'foo', ranges:['bar!$A$1:$C$1']},
+    create: function() { return new DefinedNameXform(); },
+    preparedModel: {name: 'foo', ranges: ['bar!$A$1:$C$1']},
     xml: '<definedName name="foo">bar!$A$1:$C$1</definedName>',
-    parsedModel: {name: 'foo', ranges:['bar!$A$1:$C$1']},
+    parsedModel: {name: 'foo', ranges: ['bar!$A$1:$C$1']},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Print Area',
-    create:  function() { return new DefinedNameXform()},
-    preparedModel: {name: '_xlnm.Print_Area', localSheetId: 0, ranges:['bar!$A$1:$C$10']},
+    create: function() { return new DefinedNameXform(); },
+    preparedModel: {name: '_xlnm.Print_Area', localSheetId: 0, ranges: ['bar!$A$1:$C$10']},
     xml: '<definedName name="_xlnm.Print_Area" localSheetId="0">bar!$A$1:$C$10</definedName>',
-    parsedModel: {name: '_xlnm.Print_Area', localSheetId: 0, ranges:['bar!$A$1:$C$10']},
+    parsedModel: {name: '_xlnm.Print_Area', localSheetId: 0, ranges: ['bar!$A$1:$C$10']},
     tests: ['render', 'renderIn', 'parse']
   }
 ];
 
-describe('DefinedNameXform', function () {
+describe('DefinedNameXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js b/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js
index 55df17555..92858f496 100644
--- a/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js
+++ b/spec/unit/xlsx/xform/book/workbook-view-xform.spec.js
@@ -6,30 +6,30 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Normal',
-    create:  function() { return new WorkbookViewXform()},
+    create: function() { return new WorkbookViewXform(); },
     preparedModel: {},
-    xml:  '<workbookView xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000"/>',
+    xml: '<workbookView xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000"/>',
     parsedModel: {x: 0, y: 0, width: 12000, height: 24000, visibility: 'visible'},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Hidden',
-    create:  function() { return new WorkbookViewXform()},
+    create: function() { return new WorkbookViewXform(); },
     preparedModel: {visibility: 'hidden'},
-    xml:  '<workbookView visibility="hidden" xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000"/>',
+    xml: '<workbookView visibility="hidden" xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000"/>',
     parsedModel: {visibility: 'hidden', x: 0, y: 0, width: 12000, height: 24000},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Active Tab & First Sheet',
-    create:  function() { return new WorkbookViewXform()},
+    create: function() { return new WorkbookViewXform(); },
     preparedModel: {activeTab: 2, firstSheet: 3},
-    xml:  '<workbookView xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000" activeTab="2" firstSheet="3"/>',
+    xml: '<workbookView xWindow="0" yWindow="0" windowWidth="12000" windowHeight="24000" activeTab="2" firstSheet="3"/>',
     parsedModel: {visibility: 'visible', x: 0, y: 0, width: 12000, height: 24000, activeTab: 2, firstSheet: 3},
     tests: ['render', 'renderIn', 'parse']
   }
 ];
 
-describe('WorkbookViewXform', function () {
+describe('WorkbookViewXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/book/workbook-xform.spec.js b/spec/unit/xlsx/xform/book/workbook-xform.spec.js
index aef1dc878..6983122ed 100644
--- a/spec/unit/xlsx/xform/book/workbook-xform.spec.js
+++ b/spec/unit/xlsx/xform/book/workbook-xform.spec.js
@@ -8,7 +8,7 @@ var testXformHelper = require('../test-xform-helper');
 var expectations = [
   {
     title: 'book.1',
-    create:  function() { return new WorkbookXform()},
+    create: function() { return new WorkbookXform(); },
     preparedModel: require('./data/book.1.1.json'),
     xml: fs.readFileSync(__dirname + '/data/book.1.2.xml').toString().replace(/\r\n/g, '\n'),
     parsedModel: require('./data/book.1.3.json'),
@@ -16,6 +16,6 @@ var expectations = [
   }
 ];
 
-describe('WorkbookXform', function () {
+describe('WorkbookXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/core/app-heading-pairs-xform.spec.js b/spec/unit/xlsx/xform/core/app-heading-pairs-xform.spec.js
index b846b3554..fef7ca598 100644
--- a/spec/unit/xlsx/xform/core/app-heading-pairs-xform.spec.js
+++ b/spec/unit/xlsx/xform/core/app-heading-pairs-xform.spec.js
@@ -8,20 +8,20 @@ var testXformHelper = require('../test-xform-helper');
 var expectations = [
   {
     title: 'app.01',
-    create:  function() { return new AppHeadingPairsXform()},
+    create: function() { return new AppHeadingPairsXform(); },
     preparedModel: [{ name: 'Sheet1' }],
     xml: '<HeadingPairs><vt:vector size="2" baseType="variant"><vt:variant><vt:lpstr>Worksheets</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant></vt:vector></HeadingPairs>',
     tests: ['render', 'renderIn']
   },
   {
     title: 'app.02',
-    create:  function() { return new AppHeadingPairsXform()},
-    preparedModel: [{ name:'Sheet1'}, { name: 'Sheet2'}],
+    create: function() { return new AppHeadingPairsXform(); },
+    preparedModel: [{ name: 'Sheet1'}, { name: 'Sheet2'}],
     xml: '<HeadingPairs><vt:vector size="2" baseType="variant"><vt:variant><vt:lpstr>Worksheets</vt:lpstr></vt:variant><vt:variant><vt:i4>2</vt:i4></vt:variant></vt:vector></HeadingPairs>',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('AppHeadingPairsXform', function () {
+describe('AppHeadingPairsXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/core/app-titles-of-parts-xform.spec.js b/spec/unit/xlsx/xform/core/app-titles-of-parts-xform.spec.js
index 82bb1237e..d0bb17616 100644
--- a/spec/unit/xlsx/xform/core/app-titles-of-parts-xform.spec.js
+++ b/spec/unit/xlsx/xform/core/app-titles-of-parts-xform.spec.js
@@ -8,20 +8,20 @@ var testXformHelper = require('../test-xform-helper');
 var expectations = [
   {
     title: 'app.01',
-    create:  function() { return new AppTitlesOfPartsXform()},
+    create: function() { return new AppTitlesOfPartsXform(); },
     preparedModel: [{name: 'Sheet1'}],
     xml: '<TitlesOfParts><vt:vector size="1" baseType="lpstr"><vt:lpstr>Sheet1</vt:lpstr></vt:vector></TitlesOfParts>',
     tests: ['render', 'renderIn']
   },
   {
     title: 'app.02',
-    create:  function() { return new AppTitlesOfPartsXform()},
-    preparedModel: [{name: 'Sheet1'},{name: 'Sheet2'}],
+    create: function() { return new AppTitlesOfPartsXform(); },
+    preparedModel: [{name: 'Sheet1'}, {name: 'Sheet2'}],
     xml: '<TitlesOfParts><vt:vector size="2" baseType="lpstr"><vt:lpstr>Sheet1</vt:lpstr><vt:lpstr>Sheet2</vt:lpstr></vt:vector></TitlesOfParts>',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('AppTitlesOfPartsXform', function () {
+describe('AppTitlesOfPartsXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/core/app-xform.spec.js b/spec/unit/xlsx/xform/core/app-xform.spec.js
index d6e8917f4..30e1c12bb 100644
--- a/spec/unit/xlsx/xform/core/app-xform.spec.js
+++ b/spec/unit/xlsx/xform/core/app-xform.spec.js
@@ -8,20 +8,20 @@ var testXformHelper = require('../test-xform-helper');
 var expectations = [
   {
     title: 'app.01',
-    create:  function() { return new AppXform()},
+    create: function() { return new AppXform(); },
     preparedModel: { worksheets: [{name: 'Sheet1'}] },
     xml: fs.readFileSync(__dirname + '/data/app.01.xml').toString().replace(/\r\n/g, '\n'),
     tests: ['render', 'renderIn']
   },
   {
     title: 'app.02',
-    create:  function() { return new AppXform()},
-    preparedModel: { worksheets: [{name: 'Sheet1'},{name: 'Sheet2'}], company: 'Cyber Sapiens, Ltd.', manager: 'Guyon Roche' },
+    create: function() { return new AppXform(); },
+    preparedModel: { worksheets: [{name: 'Sheet1'}, {name: 'Sheet2'}], company: 'Cyber Sapiens, Ltd.', manager: 'Guyon Roche' },
     xml: fs.readFileSync(__dirname + '/data/app.02.xml').toString().replace(/\r\n/g, '\n'),
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('AppXform', function () {
+describe('AppXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/core/content-types-xform.spec.js b/spec/unit/xlsx/xform/core/content-types-xform.spec.js
index 4f02efe60..4d5c943bb 100644
--- a/spec/unit/xlsx/xform/core/content-types-xform.spec.js
+++ b/spec/unit/xlsx/xform/core/content-types-xform.spec.js
@@ -8,20 +8,20 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Three Sheets',
-    create:  function() { return new ContentTypesXform()},
-    preparedModel: { worksheets: [{id:1}, {id:2}, {id:3},], media:[], drawings: [] },
+    create: function() { return new ContentTypesXform(); },
+    preparedModel: { worksheets: [{id: 1}, {id: 2}, {id: 3}, ], media: [], drawings: [] },
     xml: fs.readFileSync(__dirname + '/data/content-types.01.xml').toString().replace(/\r\n/g, '\n'),
     tests: ['render']
   },
   {
     title: 'Images',
-    create:  function() { return new ContentTypesXform()},
-    preparedModel: { worksheets: [{id:1}, {id:2}], media: [{type: 'image', extension: 'png'}, {type: 'image', extension: 'jpg'}], drawings: [] },
+    create: function() { return new ContentTypesXform(); },
+    preparedModel: { worksheets: [{id: 1}, {id: 2}], media: [{type: 'image', extension: 'png'}, {type: 'image', extension: 'jpg'}], drawings: [] },
     xml: fs.readFileSync(__dirname + '/data/content-types.02.xml').toString().replace(/\r\n/g, '\n'),
     tests: ['render']
   }
 ];
 
-describe('ContentTypesXform', function () {
+describe('ContentTypesXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/core/core-xform.spec.js b/spec/unit/xlsx/xform/core/core-xform.spec.js
index a8b9b1c7b..52684f0ae 100644
--- a/spec/unit/xlsx/xform/core/core-xform.spec.js
+++ b/spec/unit/xlsx/xform/core/core-xform.spec.js
@@ -8,7 +8,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'core.xml',
-    create:  () => new CoreXform(),
+    create: () => new CoreXform(),
     preparedModel: { creator: 'Guyon Roche', lastModifiedBy: 'Guyon Roche', created: new Date('2016-04-20T16:26:46Z'), modified: new Date('2016-05-12T06:52:49Z')},
     xml: fs.readFileSync(__dirname + '/data/core.01.xml').toString().replace(/\r\n/g, '\n'),
     get parsedModel() { return this.preparedModel; },
@@ -16,7 +16,7 @@ var expectations = [
   },
   {
     title: 'core.xml',
-    create:  () => new CoreXform(),
+    create: () => new CoreXform(),
     preparedModel: {
       creator: 'Guyon Roche',
       title: 'My Little Xlsx',
@@ -34,7 +34,7 @@ var expectations = [
   },
   {
     title: 'core.xml - with cp:lastPrinted',
-    create:  () => new CoreXform(),
+    create: () => new CoreXform(),
     preparedModel: { creator: 'Guyon Roche', lastModifiedBy: 'Guyon Roche', lastPrinted: new Date('2016-08-16T19:56:07Z'), created: new Date('2016-04-20T16:26:46Z'), modified: new Date('2016-05-12T06:52:49Z')},
     xml: fs.readFileSync(__dirname + '/data/core.03.xml').toString().replace(/\r\n/g, '\n'),
     get parsedModel() { return this.preparedModel; },
@@ -42,7 +42,7 @@ var expectations = [
   },
   {
     title: 'core.xml - with cp:contentStatus',
-    create:  () => new CoreXform(),
+    create: () => new CoreXform(),
     preparedModel: { creator: 'Guyon Roche', lastModifiedBy: 'Guyon Roche', contentStatus: 'Final', created: new Date('2016-04-20T16:26:46Z'), modified: new Date('2016-05-12T06:52:49Z')},
     xml: fs.readFileSync(__dirname + '/data/core.04.xml').toString().replace(/\r\n/g, '\n'),
     get parsedModel() { return this.preparedModel; },
@@ -50,6 +50,6 @@ var expectations = [
   }
 ];
 
-describe('CoreXform', function () {
+describe('CoreXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/core/relationships-xform.spec.js b/spec/unit/xlsx/xform/core/relationships-xform.spec.js
index e1731e98c..1829736ac 100644
--- a/spec/unit/xlsx/xform/core/relationships-xform.spec.js
+++ b/spec/unit/xlsx/xform/core/relationships-xform.spec.js
@@ -8,7 +8,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'worksheet.rels',
-    create:  function() { return new RelationshipsXform()},
+    create: function() { return new RelationshipsXform(); },
     preparedModel: require('./data/worksheet.rels.1.json'),
     xml: fs.readFileSync(__dirname + '/data/worksheet.rels.xml').toString().replace(/\r\n/g, '\n'),
     get parsedModel() { return this.preparedModel; },
@@ -16,6 +16,6 @@ var expectations = [
   }
 ];
 
-describe('RelationshipsXform', function () {
+describe('RelationshipsXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/drawing/data/drawing.1.1.json b/spec/unit/xlsx/xform/drawing/data/drawing.1.1.json
index 52891ee5a..5bfdbc5e1 100644
--- a/spec/unit/xlsx/xform/drawing/data/drawing.1.1.json
+++ b/spec/unit/xlsx/xform/drawing/data/drawing.1.1.json
@@ -14,7 +14,7 @@
         "tl": {"row": 2.5, "col": 5.5},
         "br": {"row": 10.5, "col": 8.5}
       },
-      "tl": {"row": 1.5, "col": 4.5},
+      "tl": {"row": 2.5, "col": 5.5},
       "br": {"row": 10.5, "col": 8.5},
       "picture": {
         "index": 2,
diff --git a/spec/unit/xlsx/xform/drawing/data/drawing.1.2.xml b/spec/unit/xlsx/xform/drawing/data/drawing.1.2.xml
index 456cc8e28..c41bd5e43 100644
--- a/spec/unit/xlsx/xform/drawing/data/drawing.1.2.xml
+++ b/spec/unit/xlsx/xform/drawing/data/drawing.1.2.xml
@@ -47,9 +47,9 @@
   </xdr:twoCellAnchor>
   <xdr:twoCellAnchor>
     <xdr:from>
-      <xdr:col>4</xdr:col>
+      <xdr:col>5</xdr:col>
       <xdr:colOff>320000</xdr:colOff>
-      <xdr:row>1</xdr:row>
+      <xdr:row>2</xdr:row>
       <xdr:rowOff>90000</xdr:rowOff>
     </xdr:from>
     <xdr:to>
diff --git a/spec/unit/xlsx/xform/drawing/data/drawing.1.3.json b/spec/unit/xlsx/xform/drawing/data/drawing.1.3.json
index d8ba49543..9b891ad67 100644
--- a/spec/unit/xlsx/xform/drawing/data/drawing.1.3.json
+++ b/spec/unit/xlsx/xform/drawing/data/drawing.1.3.json
@@ -8,7 +8,7 @@
       }
     },
     {
-      "tl": {"row": 1.5, "col": 4.5},
+      "tl": {"row": 2.5, "col": 5.5},
       "br": {"row": 10.5, "col": 8.5},
       "picture": {
         "rId": "rId2"
diff --git a/spec/unit/xlsx/xform/drawing/drawing-xform.spec.js b/spec/unit/xlsx/xform/drawing/drawing-xform.spec.js
index 8fee9e426..8c1bad6b1 100644
--- a/spec/unit/xlsx/xform/drawing/drawing-xform.spec.js
+++ b/spec/unit/xlsx/xform/drawing/drawing-xform.spec.js
@@ -12,7 +12,7 @@ const options = {
   },
   mediaIndex: { image1: 0, image2: 1 },
   media: [{}, {}],
-}
+};
 
 var expectations = [
   {
diff --git a/spec/unit/xlsx/xform/list-xform.spec.js b/spec/unit/xlsx/xform/list-xform.spec.js
index 7ea79b469..950c7db2b 100644
--- a/spec/unit/xlsx/xform/list-xform.spec.js
+++ b/spec/unit/xlsx/xform/list-xform.spec.js
@@ -7,22 +7,22 @@ var testXformHelper = require('./test-xform-helper');
 var expectations = [
   {
     title: 'Tagged',
-    create:  function() { return new ListXform({tag: 'ints', childXform: new IntegerXform({tag: 'int', attr: 'val'})})},
-    preparedModel: [1,2,3],
+    create: function() { return new ListXform({tag: 'ints', childXform: new IntegerXform({tag: 'int', attr: 'val'})}); },
+    preparedModel: [1, 2, 3],
     get parsedModel() { return this.preparedModel; },
     xml: '<ints><int val="1"/><int val="2"/><int val="3"/></ints>',
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Tagged and Counted',
-    create:  function() { return new ListXform({tag: 'ints', count: true, childXform: new IntegerXform({tag: 'int', attr: 'val'})})},
-    preparedModel: [1,2,3],
+    create: function() { return new ListXform({tag: 'ints', count: true, childXform: new IntegerXform({tag: 'int', attr: 'val'})}); },
+    preparedModel: [1, 2, 3],
     get parsedModel() { return this.preparedModel; },
     xml: '<ints count="3"><int val="1"/><int val="2"/><int val="3"/></ints>',
     tests: ['render', 'renderIn', 'parse']
   }
 ];
 
-describe('ListXform', function () {
+describe('ListXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/cell-xform.spec.js b/spec/unit/xlsx/xform/sheet/cell-xform.spec.js
index 3ceab76da..f73ae6684 100644
--- a/spec/unit/xlsx/xform/sheet/cell-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/cell-xform.spec.js
@@ -14,9 +14,9 @@ var fakeStyles = {
     return 0;
   },
   getStyleModel: function(styleId) {
-    switch(styleId) {
+    switch (styleId) {
       case 1:
-        return {numFmt:'mm-dd-yy'};
+        return {numFmt: 'mm-dd-yy'};
       default:
         return null;
     }
@@ -30,7 +30,7 @@ var fakeHyperlinkMap = {
 var expectations = [
   {
     title: 'Styled Null',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     preparedModel: {address: 'A1', type: Enums.ValueType.Null, styleId: 1},
     xml: '<c r="A1" s="1" />',
     parsedModel: {address: 'A1', type: Enums.ValueType.Null, styleId: 1},
@@ -38,7 +38,7 @@ var expectations = [
   },
   {
     title: 'Number',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     preparedModel: {address: 'A1', type: Enums.ValueType.Number, value: 5},
     parsedModel: {address: 'A1', type: Enums.ValueType.Number, value: 5},
     xml: '<c r="A1"><v>5</v></c>',
@@ -46,7 +46,7 @@ var expectations = [
   },
   {
     title: 'Boolean',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     preparedModel: {address: 'A1', type: Enums.ValueType.Boolean, value: true},
     parsedModel: {address: 'A1', type: Enums.ValueType.Boolean, value: true},
     xml: '<c r="A1" t="b"><v>1</v></c>',
@@ -54,7 +54,7 @@ var expectations = [
   },
   {
     title: 'Error',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     preparedModel: {address: 'A1', type: Enums.ValueType.Error, value: { error: '#N/A'}},
     parsedModel: {address: 'A1', type: Enums.ValueType.Error, value: { error: '#N/A'}},
     xml: '<c r="A1" t="e"><v>#N/A</v></c>',
@@ -62,7 +62,7 @@ var expectations = [
   },
   {
     title: 'Inline String',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     initialModel: {address: 'A1', type: Enums.ValueType.String, value: 'Foo'},
     preparedModel: {address: 'A1', type: Enums.ValueType.String, value: 'Foo'},
     xml: '<c r="A1" t="str"><v>Foo</v></c>',
@@ -73,7 +73,7 @@ var expectations = [
   },
   {
     title: 'Shared String',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     initialModel: {address: 'A1', type: Enums.ValueType.String, value: 'Foo'},
     preparedModel: {address: 'A1', type: Enums.ValueType.String, value: 'Foo', ssId: 0},
     xml: '<c r="A1" t="s"><v>0</v></c>',
@@ -84,7 +84,7 @@ var expectations = [
   },
   {
     title: 'Date',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     initialModel: {address: 'A1', type: Enums.ValueType.Date, value: new Date('2016-06-09T00:00:00.000Z')},
     preparedModel: {address: 'A1', type: Enums.ValueType.Date, value: new Date('2016-06-09T00:00:00.000Z'), styleId: 1},
     xml: '<c r="A1" s="1"><v>42530</v></c>',
@@ -95,7 +95,7 @@ var expectations = [
   },
   {
     title: 'Hyperlink',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     initialModel: {address: 'H1', type: Enums.ValueType.Hyperlink, hyperlink: 'http://www.foo.com', text: 'www.foo.com'},
     preparedModel: {address: 'H1', type: Enums.ValueType.Hyperlink, hyperlink: 'http://www.foo.com', text: 'www.foo.com', ssId: 0},
     xml: '<c r="H1" t="s"><v>0</v></c>',
@@ -106,7 +106,7 @@ var expectations = [
   },
   {
     title: 'String Formula',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     initialModel: {address: 'A1', type: Enums.ValueType.Formula, formula: 'A2', result: 'Foo'},
     preparedModel: {address: 'A1', type: Enums.ValueType.Formula, formula: 'A2', result: 'Foo'},
     xml: '<c r="A1" t="str"><f>A2</f><v>Foo</v></c>',
@@ -117,7 +117,7 @@ var expectations = [
   },
   {
     title: 'Number Formula',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     preparedModel: {address: 'A1', type: Enums.ValueType.Formula, formula: 'A2', result: 7},
     xml: '<c r="A1"><f>A2</f><v>7</v></c>',
     parsedModel: {address: 'A1', type: Enums.ValueType.Formula, formula: 'A2', result: 7},
@@ -126,7 +126,7 @@ var expectations = [
   },
   {
     title: 'Shared Formula',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     initialModel: {address: 'A2', type: Enums.ValueType.Formula, sharedFormula: 'A1', result: 2},
     preparedModel: {address: 'A2', type: Enums.ValueType.Formula, sharedFormula: 'A1', result: 2, si: 0 },
     xml: '<c r="A2"><f t="shared" si="0" /><v>2</v></c>',
@@ -146,7 +146,7 @@ var expectations = [
   },
   {
     title: 'Master Shared Formula',
-    create:  function() { return new CellXform()},
+    create: function() { return new CellXform(); },
     preparedModel: {address: 'A2', type: Enums.ValueType.Formula, formula: 'A1', result: 2, si: 0 },
     xml: '<c r="A2"><f t="shared" si="0">A1</f><v>2</v></c>',
     parsedModel: {address: 'A2', type: Enums.ValueType.Formula, formula: 'A1', result: 2, si: '0', sharedFormula: true },
@@ -162,6 +162,6 @@ var expectations = [
   },
 ];
 
-describe('CellXform', function () {
+describe('CellXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/col-xform.spec.js b/spec/unit/xlsx/xform/sheet/col-xform.spec.js
index f1fff0692..41cafffd8 100644
--- a/spec/unit/xlsx/xform/sheet/col-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/col-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Best Fit',
-    create:  function() { return new ColXform()},
+    create: () => new ColXform(),
     preparedModel: {min: 2, max: 2, width: 10.15625, bestFit: true},
     get parsedModel() { return this.preparedModel; },
     xml: '<col min="2" max="2" width="10.15625" bestFit="1" customWidth="1"/>',
@@ -14,7 +14,7 @@ var expectations = [
   },
   {
     title: 'Outline',
-    create:  function() { return new ColXform()},
+    create: () => new ColXform(),
     preparedModel: {min: 2, max: 2, width: 10.15625, bestFit: true, outlineLevel: 1, collapsed: true},
     xml: '<col min="2" max="2" width="10.15625" bestFit="1" customWidth="1" outlineLevel="1" collapsed="1"/>',
     parsedModel: {min: 2, max: 2, width: 10.15625, bestFit: true, outlineLevel: 1, collapsed: true},
@@ -22,6 +22,6 @@ var expectations = [
   }
 ];
 
-describe('ColXform', function () {
+describe('ColXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/data-validations-xform.spec.js b/spec/unit/xlsx/xform/sheet/data-validations-xform.spec.js
index 6f13f73d9..11aa4052c 100644
--- a/spec/unit/xlsx/xform/sheet/data-validations-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/data-validations-xform.spec.js
@@ -7,7 +7,7 @@ var expectations = [
   {
     title: 'list type',
     create: () => new DataValidationsXform(),
-    preparedModel:{ E1: { type: 'list', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae:['Ducks']} },
+    preparedModel: { E1: { type: 'list', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae: ['Ducks']} },
     get parsedModel() { return this.preparedModel; },
     xml: '<dataValidations count="1"><dataValidation type="list" allowBlank="1" showInputMessage="1" showErrorMessage="1" sqref="E1"><formula1>Ducks</formula1></dataValidation></dataValidations>',
     tests: ['render', 'renderIn', 'parse']
@@ -15,7 +15,7 @@ var expectations = [
   {
     title: 'whole type',
     create: () => new DataValidationsXform(),
-    preparedModel:{ A1: { type: 'whole', operator:'between', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae:[5, 10]} },
+    preparedModel: { A1: { type: 'whole', operator: 'between', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae: [5, 10]} },
     get parsedModel() { return this.preparedModel; },
     xml: '<dataValidations count="1"><dataValidation type="whole" allowBlank="1" showInputMessage="1" showErrorMessage="1" sqref="A1"><formula1>5</formula1><formula2>10</formula2></dataValidation></dataValidations>',
     tests: ['render', 'renderIn', 'parse']
@@ -23,7 +23,7 @@ var expectations = [
   {
     title: 'decimal type',
     create: () => new DataValidationsXform(),
-    preparedModel:{ A1: { type: 'decimal', operator:'notBetween', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae:[5, 10]} },
+    preparedModel: { A1: { type: 'decimal', operator: 'notBetween', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae: [5, 10]} },
     get parsedModel() { return this.preparedModel; },
     xml: '<dataValidations count="1"><dataValidation type="decimal" operator="notBetween" allowBlank="1" showInputMessage="1" showErrorMessage="1" sqref="A1"><formula1>5</formula1><formula2>10</formula2></dataValidation></dataValidations>',
     tests: ['render', 'renderIn', 'parse']
@@ -31,7 +31,7 @@ var expectations = [
   {
     title: 'custom type',
     create: () => new DataValidationsXform(),
-    preparedModel:{ A1: { type: 'custom', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae:['OR(C21=5,C21=7)']} },
+    preparedModel: { A1: { type: 'custom', allowBlank: true, showInputMessage: true, showErrorMessage: true, formulae: ['OR(C21=5,C21=7)']} },
     get parsedModel() { return this.preparedModel; },
     xml: '<dataValidations count="1"><dataValidation type="custom" allowBlank="1" showInputMessage="1" showErrorMessage="1" sqref="A1"><formula1>OR(C21=5,C21=7)</formula1></dataValidation></dataValidations>',
     tests: ['render', 'renderIn', 'parse']
@@ -40,7 +40,7 @@ var expectations = [
     title: 'parse open office',
     create: () => new DataValidationsXform(),
     xml: '<dataValidations count="1"><dataValidation type="whole" allowBlank="true" showInputMessage="false" sqref="A1"><formula1>5</formula1><formula2>10</formula2></dataValidation></dataValidations>',
-    parsedModel:{ A1: { type: 'whole', operator:'between', allowBlank: true, showInputMessage: false, formulae:[5, 10]} },
+    parsedModel: { A1: { type: 'whole', operator: 'between', allowBlank: true, showInputMessage: false, formulae: [5, 10]} },
     tests: ['parse']
   }
 ];
diff --git a/spec/unit/xlsx/xform/sheet/dimension-xform.spec.js b/spec/unit/xlsx/xform/sheet/dimension-xform.spec.js
index b30c93168..b008bf7c9 100644
--- a/spec/unit/xlsx/xform/sheet/dimension-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/dimension-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Dimension',
-    create:  function() { return new DimensionXform()},
+    create: function() { return new DimensionXform(); },
     preparedModel: 'A1:F5',
     get parsedModel() { return this.preparedModel; },
     xml: '<dimension ref="A1:F5"/>',
@@ -14,6 +14,6 @@ var expectations = [
   }
 ];
 
-describe('DimensionXform', function () {
+describe('DimensionXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/hyperlink-xform.spec.js b/spec/unit/xlsx/xform/sheet/hyperlink-xform.spec.js
index de7a3c2fd..b0336a100 100644
--- a/spec/unit/xlsx/xform/sheet/hyperlink-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/hyperlink-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Web Link',
-    create:  function() { return new HyperlinkXform()},
+    create: function() { return new HyperlinkXform(); },
     preparedModel: {address: 'B6', rId: 'rId1' },
     get parsedModel() { return this.preparedModel; },
     xml: '<hyperlink ref="B6" r:id="rId1"/>',
@@ -14,6 +14,6 @@ var expectations = [
   }
 ];
 
-describe('HyperlinkXform', function () {
+describe('HyperlinkXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/merge-cell-xform.spec.js b/spec/unit/xlsx/xform/sheet/merge-cell-xform.spec.js
index c691afd25..400295ad2 100644
--- a/spec/unit/xlsx/xform/sheet/merge-cell-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/merge-cell-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Merge',
-    create:  function() { return new MergeCellXform()},
+    create: function() { return new MergeCellXform(); },
     preparedModel: 'B2:C4',
     xml: '<mergeCell ref="B2:C4"/>',
     parsedModel: 'B2:C4',
@@ -14,6 +14,6 @@ var expectations = [
   }
 ];
 
-describe('MergeCellXform', function () {
+describe('MergeCellXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/page-margins-xform.spec.js b/spec/unit/xlsx/xform/sheet/page-margins-xform.spec.js
index aba84c5fc..34a8ad625 100644
--- a/spec/unit/xlsx/xform/sheet/page-margins-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/page-margins-xform.spec.js
@@ -7,9 +7,9 @@ var expectations = [
   {
     title: 'normal',
     create: function() { return new PageMarginsXform(); },
-    preparedModel: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer:  0.3 },
+    preparedModel: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer: 0.3 },
     xml: '<pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>',
-    parsedModel: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer:  0.3 },
+    parsedModel: {left: 0.7, right: 0.7, top: 0.75, bottom: 0.75, header: 0.3, footer: 0.3 },
     tests: ['render', 'renderIn', 'parse']
   }
 ];
diff --git a/spec/unit/xlsx/xform/sheet/page-setup-xform.spec.js b/spec/unit/xlsx/xform/sheet/page-setup-xform.spec.js
index 23fec52f5..1a21e82e9 100644
--- a/spec/unit/xlsx/xform/sheet/page-setup-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/page-setup-xform.spec.js
@@ -23,11 +23,26 @@ var expectations = [
   {
     title: 'normal',
     create: () => new PageSetupXform(),
-    preparedModel: {paperSize: 9, orientation:'portrait', horizontalDpi: 4294967295, verticalDpi: 4294967295},
+    preparedModel: {paperSize: 9, orientation: 'portrait', horizontalDpi: 4294967295, verticalDpi: 4294967295},
     xml: '<pageSetup paperSize="9" orientation="portrait" horizontalDpi="4294967295" verticalDpi="4294967295"/>',
-    parsedModel: {paperSize: 9, orientation:'portrait', horizontalDpi: 4294967295, verticalDpi: 4294967295,
-      firstPageNumber: 1, useFirstPageNumber: false, usePrinterDefaults: false, copies: 1,
-      blackAndWhite: false, cellComments: 'None', draft: false, errors: 'displayed', fitToHeight: 1, fitToWidth: 1, pageOrder: 'downThenOver', scale: 100},
+    parsedModel: {
+      paperSize: 9,
+      orientation: 'portrait',
+      horizontalDpi: 4294967295,
+      verticalDpi: 4294967295,
+      firstPageNumber: 1,
+      useFirstPageNumber: false,
+      usePrinterDefaults: false,
+      copies: 1,
+      blackAndWhite: false,
+      cellComments: 'None',
+      draft: false,
+      errors: 'displayed',
+      fitToHeight: 1,
+      fitToWidth: 1,
+      pageOrder: 'downThenOver',
+      scale: 100
+    },
     tests: ['render', 'renderIn', 'parse']
   },
   {
diff --git a/spec/unit/xlsx/xform/sheet/row-xform.spec.js b/spec/unit/xlsx/xform/sheet/row-xform.spec.js
index f45953b99..1933e047b 100644
--- a/spec/unit/xlsx/xform/sheet/row-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/row-xform.spec.js
@@ -22,7 +22,7 @@ var fakeHyperlinkMap = {
 var expectations = [
   {
     title: 'Plain',
-    create:  () => new RowXform(),
+    create: () => new RowXform(),
     initialModel: {number: 1, min: 1, max: 1, style: {}, cells: [{address: 'A1', type: Enums.ValueType.Number, value: 5}]},
     get preparedModel() { return this.initialModel; },
     xml: '<row r="1" spans="1:1" x14ac:dyDescent="0.25"><c r="A1"><v>5</v></c></row>',
@@ -33,7 +33,7 @@ var expectations = [
   },
   {
     title: 'No spans',
-    create:  () => new RowXform(),
+    create: () => new RowXform(),
     initialModel: {number: 1, style: {}, cells: [{address: 'A1', type: Enums.ValueType.Number, value: 5}]},
     get preparedModel() { return this.initialModel; },
     xml: '<row r="1" x14ac:dyDescent="0.25"><c r="A1"><v>5</v></c></row>',
@@ -44,28 +44,28 @@ var expectations = [
   },
   {
     title: 'Styled',
-    create:  () => new RowXform(),
-    initialModel: {number: 2, min:1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}]},
-    preparedModel: {number: 2, min:1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], styleId: 1},
+    create: () => new RowXform(),
+    initialModel: {number: 2, min: 1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}]},
+    preparedModel: {number: 2, min: 1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], styleId: 1},
     xml: '<row r="2" spans="1:1" s="1" customFormat="1" x14ac:dyDescent="0.25"><c r="A2"><v>5</v></c></row>',
-    parsedModel: {number: 2, min:1, max: 1, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], styleId: 1},
-    reconciledModel: {number: 2, min:1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}]},
+    parsedModel: {number: 2, min: 1, max: 1, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], styleId: 1},
+    reconciledModel: {number: 2, min: 1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}]},
     tests: ['prepare', 'render', 'renderIn', 'parse', 'reconcile'],
     options: { sharedStrings: new SharedStringsXform(), styles: fakeStyles, hyperlinkMap: fakeHyperlinkMap }
   },
   {
     title: 'Outline',
-    create:  () => new RowXform(),
-    initialModel: {number: 2, min:1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, collapsed: true},
-    preparedModel: {number: 2, min:1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, styleId: 1, collapsed: true},
+    create: () => new RowXform(),
+    initialModel: {number: 2, min: 1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, collapsed: true},
+    preparedModel: {number: 2, min: 1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, styleId: 1, collapsed: true},
     xml: '<row r="2" spans="1:1" s="1" customFormat="1" outlineLevel="1" collapsed="1" x14ac:dyDescent="0.25"><c r="A2"><v>5</v></c></row>',
-    parsedModel: {number: 2, min:1, max: 1, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, collapsed: true, styleId: 1},
-    reconciledModel: {number: 2, min:1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, collapsed: true},
+    parsedModel: {number: 2, min: 1, max: 1, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, collapsed: true, styleId: 1},
+    reconciledModel: {number: 2, min: 1, max: 1, style: {numFmt: '#'}, cells: [{address: 'A2', type: Enums.ValueType.Number, value: 5}], outlineLevel: 1, collapsed: true},
     tests: ['prepare', 'render', 'renderIn', 'parse', 'reconcile'],
     options: { sharedStrings: new SharedStringsXform(), styles: fakeStyles, hyperlinkMap: fakeHyperlinkMap }
   }
 ];
 
-describe('RowXform', function () {
+describe('RowXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/sheet-format-properties-xform.spec.js b/spec/unit/xlsx/xform/sheet/sheet-format-properties-xform.spec.js
index 2be75cc87..2bebaabeb 100644
--- a/spec/unit/xlsx/xform/sheet/sheet-format-properties-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/sheet-format-properties-xform.spec.js
@@ -17,7 +17,7 @@ var expectations = [
     create: function() { return new SheetFormatPropertiesXform(); },
     preparedModel: {defaultRowHeight: 14.4, dyDescent: 0.55},
     xml: '<sheetFormatPr defaultRowHeight="14.4" x14ac:dyDescent="0.55"/>',
-    parsedModel: {defaultRowHeight: 14.4, dyDescent: 0.55, outlineLevelRow: 0, outlineLevelCol:  0},
+    parsedModel: {defaultRowHeight: 14.4, dyDescent: 0.55, outlineLevelRow: 0, outlineLevelCol: 0},
     tests: ['render', 'renderIn', 'parse']
   }
 ];
diff --git a/spec/unit/xlsx/xform/sheet/sheet-properties-xform.spec.js b/spec/unit/xlsx/xform/sheet/sheet-properties-xform.spec.js
index 2a0f2d337..6c00ba11d 100644
--- a/spec/unit/xlsx/xform/sheet/sheet-properties-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/sheet-properties-xform.spec.js
@@ -15,9 +15,9 @@ var expectations = [
   {
     title: 'tabColor',
     create: function() { return new SheetPropertiesXform(); },
-    preparedModel: {tabColor: { argb:'FFFF0000'}},
+    preparedModel: {tabColor: { argb: 'FFFF0000'}},
     xml: '<sheetPr><tabColor rgb="FFFF0000"/></sheetPr>',
-    parsedModel: {tabColor: { argb:'FFFF0000'}},
+    parsedModel: {tabColor: { argb: 'FFFF0000'}},
     tests: ['render', 'renderIn', 'parse']
   },
   {
@@ -31,9 +31,9 @@ var expectations = [
   {
     title: 'tabColor + pageSetup',
     create: function() { return new SheetPropertiesXform(); },
-    preparedModel: {tabColor: { argb:'FFFF0000'}, pageSetup: {fitToPage: true}},
+    preparedModel: {tabColor: { argb: 'FFFF0000'}, pageSetup: {fitToPage: true}},
     xml: '<sheetPr><tabColor rgb="FFFF0000"/><pageSetUpPr fitToPage="1"/></sheetPr>',
-    parsedModel: {tabColor: { argb:'FFFF0000'}, pageSetup: {fitToPage: true}},
+    parsedModel: {tabColor: { argb: 'FFFF0000'}, pageSetup: {fitToPage: true}},
     tests: ['render', 'renderIn', 'parse']
   }
 ];
diff --git a/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js b/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js
index 37cfc9d5a..b4ef308ee 100644
--- a/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/sheet-view-xform.spec.js
@@ -8,93 +8,93 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Normal',
-    create:  function() { return new SheetViewXform()},
+    create: () => new SheetViewXform(),
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4'},
-    xml:  '<sheetView workbookViewId="0">' +
-            '<selection activeCell="G4" sqref="G4"/>' +
-          '</sheetView>',
+    xml: '<sheetView workbookViewId="0">' +
+           '<selection activeCell="G4" sqref="G4"/>' +
+         '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Normal Zoom',
-    create:  function() { return new SheetViewXform()},
+    create: () => new SheetViewXform(),
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', zoomScale: 60, zoomScaleNormal: 80},
-    xml:  '<sheetView workbookViewId="0" zoomScale="60" zoomScaleNormal="80">' +
-            '<selection activeCell="G4" sqref="G4"/>' +
-          '</sheetView>',
+    xml: '<sheetView workbookViewId="0" zoomScale="60" zoomScaleNormal="80">' +
+           '<selection activeCell="G4" sqref="G4"/>' +
+         '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 60, zoomScaleNormal: 80},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Normal unruly noliney nohdr',
-    create:  function() { return new SheetViewXform()},
+    create: () => new SheetViewXform(),
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: false, showGridLines: false, showRowColHeaders: false},
-    xml:  '<sheetView workbookViewId="0" showRuler="0" showGridLines="0" showRowColHeaders="0">' +
-            '<selection activeCell="G4" sqref="G4"/>' +
-          '</sheetView>',
+    xml: '<sheetView workbookViewId="0" showRuler="0" showGridLines="0" showRowColHeaders="0">' +
+           '<selection activeCell="G4" sqref="G4"/>' +
+         '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: false, showGridLines: false, showRowColHeaders: false, zoomScale: 100, zoomScaleNormal: 100},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Page Break Preview',
-    create:  function() { return new SheetViewXform()},
+    create: () => new SheetViewXform(),
     preparedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', style: 'pageBreakPreview'},
-    xml:  '<sheetView workbookViewId="0" view="pageBreakPreview">' +
-            '<selection activeCell="G4" sqref="G4"/>' +
-          '</sheetView>',
+    xml: '<sheetView workbookViewId="0" view="pageBreakPreview">' +
+           '<selection activeCell="G4" sqref="G4"/>' +
+         '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100, style: 'pageBreakPreview'},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Split',
-    create:  function() { return new SheetViewXform()},
+    create: () => new SheetViewXform(),
     preparedModel: {workbookViewId: 0, state: 'split', xSplit: 1234, ySplit: 3456, topLeftCell: 'C3', activeCell: 'B1', activePane: 'bottomRight'},
-    xml:  '<sheetView workbookViewId="0">' +
-            '<pane xSplit="1234" ySplit="3456" topLeftCell="C3" activePane="bottomRight"/>' +
-            '<selection pane="bottomRight" activeCell="B1" sqref="B1"/>' +
-          '</sheetView>',
+    xml: '<sheetView workbookViewId="0">' +
+           '<pane xSplit="1234" ySplit="3456" topLeftCell="C3" activePane="bottomRight"/>' +
+           '<selection pane="bottomRight" activeCell="B1" sqref="B1"/>' +
+         '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'split', xSplit: 1234, ySplit: 3456, topLeftCell: 'C3', activeCell: 'B1', activePane: 'bottomRight', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Split Top Left',
-    create:  function() { return new SheetViewXform()},
+    create: () => new SheetViewXform(),
     preparedModel: {workbookViewId: 0, state: 'split', xSplit: 1234, ySplit: 3456, topLeftCell: 'C3', activeCell: 'A1', activePane: 'topLeft'},
-    xml:  '<sheetView workbookViewId="0">' +
-            '<pane xSplit="1234" ySplit="3456" topLeftCell="C3"/>' +
-            '<selection activeCell="A1" sqref="A1"/>' +
-          '</sheetView>',
+    xml: '<sheetView workbookViewId="0">' +
+           '<pane xSplit="1234" ySplit="3456" topLeftCell="C3"/>' +
+           '<selection activeCell="A1" sqref="A1"/>' +
+         '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'split', xSplit: 1234, ySplit: 3456, topLeftCell: 'C3', activeCell: 'A1', activePane: 'topLeft', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Frozen',
-    create:  function() { return new SheetViewXform()},
+    create: () => new SheetViewXform(),
     preparedModel: {workbookViewId: 0, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5'},
-    xml:  '<sheetView workbookViewId="0">' +
-            '<pane xSplit="2" ySplit="3" topLeftCell="C4" activePane="bottomRight" state="frozen"/>' +
-            '<selection pane="bottomRight" activeCell="D5" sqref="D5"/>' +
-          '</sheetView>',
+    xml: '<sheetView workbookViewId="0">' +
+           '<pane xSplit="2" ySplit="3" topLeftCell="C4" activePane="bottomRight" state="frozen"/>' +
+           '<selection pane="bottomRight" activeCell="D5" sqref="D5"/>' +
+         '</sheetView>',
     parsedModel: {workbookViewId: 0, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100},
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'List',
-    create:  function() { return new ListXform({tag: 'sheetViews', count: false, childXform: new SheetViewXform()}) },
+    create: () => new ListXform({tag: 'sheetViews', count: false, childXform: new SheetViewXform()}),
     preparedModel: [
       {workbookViewId: 0, state: 'normal', activeCell: 'G4'},
       {workbookViewId: 1, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5'}
     ],
-    xml:  '<sheetViews>' +
-            '<sheetView workbookViewId="0">' +
-              '<selection activeCell="G4" sqref="G4"/>' +
-            '</sheetView>' +
-            '<sheetView workbookViewId="1">' +
-              '<pane xSplit="2" ySplit="3" topLeftCell="C4" activePane="bottomRight" state="frozen"/>' +
-              '<selection pane="bottomRight" activeCell="D5" sqref="D5"/>' +
-            '</sheetView>' +
-          '</sheetViews>',
+    xml: '<sheetViews>' +
+           '<sheetView workbookViewId="0">' +
+             '<selection activeCell="G4" sqref="G4"/>' +
+           '</sheetView>' +
+           '<sheetView workbookViewId="1">' +
+             '<pane xSplit="2" ySplit="3" topLeftCell="C4" activePane="bottomRight" state="frozen"/>' +
+             '<selection pane="bottomRight" activeCell="D5" sqref="D5"/>' +
+           '</sheetView>' +
+         '</sheetViews>',
     parsedModel: [
       {workbookViewId: 0, state: 'normal', activeCell: 'G4', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100},
       {workbookViewId: 1, state: 'frozen', xSplit: 2, ySplit: 3, topLeftCell: 'C4', activeCell: 'D5', showRuler: true, showGridLines: true, showRowColHeaders: true, zoomScale: 100, zoomScaleNormal: 100}
@@ -103,6 +103,6 @@ var expectations = [
   }
 ];
 
-describe('SheetViewXform', function () {
+describe('SheetViewXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/sheet/worksheet-xform.spec.js b/spec/unit/xlsx/xform/sheet/worksheet-xform.spec.js
index f84f8a5fe..e5725a651 100644
--- a/spec/unit/xlsx/xform/sheet/worksheet-xform.spec.js
+++ b/spec/unit/xlsx/xform/sheet/worksheet-xform.spec.js
@@ -25,7 +25,7 @@ var fakeStyles = {
     return 0;
   },
   getStyleModel: function(id) {
-    switch(id) {
+    switch (id) {
       case 1:
         return {numFmt: 'mm-dd-yy' };
       case 2:
@@ -48,7 +48,7 @@ function fixDate(model) {
 var expectations = [
   {
     title: 'Sheet 1',
-    create:  () => new WorksheetXform(),
+    create: () => new WorksheetXform(),
     initialModel: fixDate(require('./data/sheet.1.0.json')),
     preparedModel: fixDate(require('./data/sheet.1.1.json')),
     xml: fs.readFileSync(__dirname + '/data/sheet.1.2.xml').toString(),
@@ -59,7 +59,7 @@ var expectations = [
   },
   {
     title: 'Sheet 2 - Data Validations',
-    create:  () => new WorksheetXform(),
+    create: () => new WorksheetXform(),
     initialModel: require('./data/sheet.2.0.json'),
     preparedModel: require('./data/sheet.2.1.json'),
     xml: fs.readFileSync(__dirname + '/data/sheet.2.2.xml').toString(),
@@ -68,7 +68,7 @@ var expectations = [
   },
   {
     title: 'Sheet 3 - Empty Sheet',
-    create:  () => new WorksheetXform(),
+    create: () => new WorksheetXform(),
     preparedModel: require('./data/sheet.3.1.json'),
     xml: fs.readFileSync(__dirname + '/data/sheet.3.2.xml').toString(),
     tests: ['render'],
@@ -76,7 +76,7 @@ var expectations = [
   },
   {
     title: 'Sheet 5 - Shared Formulas',
-    create:  () => new WorksheetXform(),
+    create: () => new WorksheetXform(),
     initialModel: require('./data/sheet.5.0.json'),
     preparedModel: require('./data/sheet.5.1.json'),
     xml: fs.readFileSync(__dirname + '/data/sheet.5.2.xml').toString(),
@@ -87,7 +87,7 @@ var expectations = [
   },
   {
     title: 'Sheet 6 - AutoFilter',
-    create:  () => new WorksheetXform(),
+    create: () => new WorksheetXform(),
     preparedModel: require('./data/sheet.6.1.json'),
     xml: fs.readFileSync(__dirname + '/data/sheet.6.2.xml').toString(),
     parsedModel: require('./data/sheet.6.3.json'),
@@ -96,7 +96,7 @@ var expectations = [
   },
 ];
 
-describe('WorksheetXform', function () {
+describe('WorksheetXform', function() {
   testXformHelper(expectations);
 
   it('hyperlinks must be after dataValidations', function() {
diff --git a/spec/unit/xlsx/xform/simple/boolean-xform.spec.js b/spec/unit/xlsx/xform/simple/boolean-xform.spec.js
index 708fa26d8..7284de018 100644
--- a/spec/unit/xlsx/xform/simple/boolean-xform.spec.js
+++ b/spec/unit/xlsx/xform/simple/boolean-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'true',
-    create:  function() { return new BooleanXform({tag: 'boolean', attr: 'val'})},
+    create: function() { return new BooleanXform({tag: 'boolean', attr: 'val'}); },
     preparedModel: true,
     get parsedModel() { return this.preparedModel; },
     xml: '<boolean/>',
@@ -14,20 +14,20 @@ var expectations = [
   },
   {
     title: 'false',
-    create:  function() { return new BooleanXform({tag: 'boolean', attr: 'val'})},
+    create: function() { return new BooleanXform({tag: 'boolean', attr: 'val'}); },
     preparedModel: false,
     xml: '',
     tests: ['render', 'renderIn']
   },
   {
     title: 'undefined',
-    create:  function() { return new BooleanXform({tag: 'boolean', attr: 'val'})},
+    create: function() { return new BooleanXform({tag: 'boolean', attr: 'val'}); },
     preparedModel: undefined,
     xml: '',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('BooleanXform', function () {
+describe('BooleanXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/simple/date-xform.spec.js b/spec/unit/xlsx/xform/simple/date-xform.spec.js
index 64642eef4..55dd3c262 100644
--- a/spec/unit/xlsx/xform/simple/date-xform.spec.js
+++ b/spec/unit/xlsx/xform/simple/date-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'date',
-    create:  function() { return new DateXform({tag: 'date', attr: 'val'})},
+    create: function() { return new DateXform({tag: 'date', attr: 'val'}); },
     preparedModel: new Date('2016-07-13T00:00:00Z'),
     xml: '<date val="2016-07-13T00:00:00.000Z"/>',
     parsedModel: new Date('2016-07-13T00:00:00Z'),
@@ -14,11 +14,14 @@ var expectations = [
   },
   {
     title: 'iso-date',
-    create:  function() { return new DateXform({
-      tag: 'date', attr: 'val',
-      format: function(dt) {return dt.toISOString().split('T')[0]},
-      parse: function(value) { return new Date(value.replace('13', '14'))}
-    })},
+    create: function() {
+      return new DateXform({
+        tag: 'date',
+        attr: 'val',
+        format: function(dt) { return dt.toISOString().split('T')[0]; },
+        parse: function(value) { return new Date(value.replace('13', '14')); }
+      });
+    },
     preparedModel: new Date('2016-07-13T00:00:00Z'),
     xml: '<date val="2016-07-13"/>',
     parsedModel: new Date('2016-07-14T00:00:00Z'),
@@ -26,13 +29,13 @@ var expectations = [
   },
   {
     title: 'undefined',
-    create:  function() { return new DateXform({tag: 'date', attr: 'val'})},
+    create: function() { return new DateXform({tag: 'date', attr: 'val'}); },
     preparedModel: undefined,
     xml: '',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('DateXform', function () {
+describe('DateXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/simple/float-xform.spec.js b/spec/unit/xlsx/xform/simple/float-xform.spec.js
index 8f6b3be1b..16e472221 100644
--- a/spec/unit/xlsx/xform/simple/float-xform.spec.js
+++ b/spec/unit/xlsx/xform/simple/float-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'five',
-    create:  function() { return new FloatXform({tag: 'float', attr: 'val'})},
+    create: function() { return new FloatXform({tag: 'float', attr: 'val'}); },
     preparedModel: 5,
     xml: '<float val="5"/>',
     parsedModel: 5,
@@ -14,7 +14,7 @@ var expectations = [
   },
   {
     title: 'pi',
-    create:  function() { return new FloatXform({tag: 'float', attr: 'val'})},
+    create: function() { return new FloatXform({tag: 'float', attr: 'val'}); },
     preparedModel: 3.14,
     xml: '<float val="3.14"/>',
     parsedModel: 3.14,
@@ -22,7 +22,7 @@ var expectations = [
   },
   {
     title: 'zero',
-    create:  function() { return new FloatXform({tag: 'float', attr: 'val'})},
+    create: function() { return new FloatXform({tag: 'float', attr: 'val'}); },
     preparedModel: 0,
     xml: '<float val="0"/>',
     parsedModel: 0,
@@ -30,13 +30,13 @@ var expectations = [
   },
   {
     title: 'undefined',
-    create:  function() { return new FloatXform({tag: 'float', attr: 'val'})},
+    create: function() { return new FloatXform({tag: 'float', attr: 'val'}); },
     preparedModel: undefined,
     xml: '',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('FloatXform', function () {
+describe('FloatXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/simple/integer-xform.spec.js b/spec/unit/xlsx/xform/simple/integer-xform.spec.js
index 11b2d3c25..5ea278566 100644
--- a/spec/unit/xlsx/xform/simple/integer-xform.spec.js
+++ b/spec/unit/xlsx/xform/simple/integer-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'five',
-    create:  function() { return new IntegerXform({tag: 'integer', attr: 'val'})},
+    create: function() { return new IntegerXform({tag: 'integer', attr: 'val'}); },
     preparedModel: 5,
     xml: '<integer val="5"/>',
     parsedModel: 5,
@@ -14,20 +14,20 @@ var expectations = [
   },
   {
     title: 'zero',
-    create:  function() { return new IntegerXform({tag: 'integer', attr: 'val'})},
+    create: function() { return new IntegerXform({tag: 'integer', attr: 'val'}); },
     preparedModel: 0,
     xml: '',
     tests: ['render', 'renderIn']
   },
   {
     title: 'undefined',
-    create:  function() { return new IntegerXform({tag: 'integer', attr: 'val'})},
+    create: function() { return new IntegerXform({tag: 'integer', attr: 'val'}); },
     preparedModel: undefined,
     xml: '',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('IntegerXform', function () {
+describe('IntegerXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/simple/string-xform.spec.js b/spec/unit/xlsx/xform/simple/string-xform.spec.js
index b1ee0bf46..6638c68f0 100644
--- a/spec/unit/xlsx/xform/simple/string-xform.spec.js
+++ b/spec/unit/xlsx/xform/simple/string-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'hello',
-    create:  function() { return new StringXform({tag: 'string', attr: 'val'})},
+    create: function() { return new StringXform({tag: 'string', attr: 'val'}); },
     preparedModel: 'Hello, World!',
     xml: '<string val="Hello, World!"/>',
     parsedModel: 'Hello, World!',
@@ -14,7 +14,7 @@ var expectations = [
   },
   {
     title: 'empty',
-    create:  function() { return new StringXform({tag: 'string', attr: 'val'})},
+    create: function() { return new StringXform({tag: 'string', attr: 'val'}); },
     preparedModel: '',
     xml: '<string val=""/>',
     parsedModel: '',
@@ -22,13 +22,13 @@ var expectations = [
   },
   {
     title: 'undefined',
-    create:  function() { return new StringXform({tag: 'string', attr: 'val'})},
+    create: function() { return new StringXform({tag: 'string', attr: 'val'}); },
     preparedModel: undefined,
     xml: '',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('StringXform', function () {
+describe('StringXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/static-xform.spec.js b/spec/unit/xlsx/xform/static-xform.spec.js
index 6fa6643db..bf855233d 100644
--- a/spec/unit/xlsx/xform/static-xform.spec.js
+++ b/spec/unit/xlsx/xform/static-xform.spec.js
@@ -15,7 +15,7 @@ var testXformHelper = require('./test-xform-helper');
 var expectations = [
   {
     title: 'Leaf',
-    create:  function() { return new StaticXform({tag: 'root', $: {attr: 'val'}})},
+    create: function() { return new StaticXform({tag: 'root', $: {attr: 'val'}}); },
     preparedModel: undefined,
     get parsedModel() { return this.preparedModel; },
     xml: '<root attr="val"/>',
@@ -23,7 +23,7 @@ var expectations = [
   },
   {
     title: 'Nested',
-    create:  function() { return new StaticXform({tag: 'root', $: {attr: 'val'}, c: [{tag:'child1', $: {attr: 5}},{tag:'child2', $: {attr: true}}]})},
+    create: function() { return new StaticXform({tag: 'root', $: {attr: 'val'}, c: [{tag: 'child1', $: {attr: 5}}, {tag: 'child2', $: {attr: true}}]}); },
     preparedModel: undefined,
     get parsedModel() { return this.preparedModel; },
     xml: '<root attr="val"><child1 attr="5"/><child2 attr="true"/></root>',
@@ -31,7 +31,7 @@ var expectations = [
   },
   {
     title: 'Texted',
-    create:  function() { return new StaticXform({tag: 'root', $: {attr: 'val'}, c: [{tag:'child1', $: {attr: 5}, t:'Hello, World!'}]})},
+    create: function() { return new StaticXform({tag: 'root', $: {attr: 'val'}, c: [{tag: 'child1', $: {attr: 5}, t: 'Hello, World!'}]}); },
     preparedModel: undefined,
     get parsedModel() { return this.preparedModel; },
     xml: '<root attr="val"><child1 attr="5">Hello, World!</child1></root>',
@@ -39,6 +39,6 @@ var expectations = [
   }
 ];
 
-describe('StaticXform', function () {
+describe('StaticXform', function() {
   testXformHelper(expectations);
 });
\ No newline at end of file
diff --git a/spec/unit/xlsx/xform/strings/phonetic-text-xform.spec.js b/spec/unit/xlsx/xform/strings/phonetic-text-xform.spec.js
index 881da3079..ff6e2cbda 100644
--- a/spec/unit/xlsx/xform/strings/phonetic-text-xform.spec.js
+++ b/spec/unit/xlsx/xform/strings/phonetic-text-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'text',
-    create:  function() { return new PhoneticTextXform(); },
+    create: function() { return new PhoneticTextXform(); },
     preparedModel: { text: 'Hello, World!', sb: 0, eb: 1 },
     xml: '<rPh sb="0" eb="1"><t>Hello, World!</t></rPh>',
     parsedModel: { text: 'Hello, World!', sb: 0, eb: 1 },
@@ -14,14 +14,14 @@ var expectations = [
   },
   {
     title: 'Katakana',
-    create:  function() { return new PhoneticTextXform(); },
-    preparedModel: { sb:0, eb:2, text: 'ヤクワリ'},
+    create: function() { return new PhoneticTextXform(); },
+    preparedModel: { sb: 0, eb: 2, text: 'ヤクワリ'},
     xml: '<rPh sb="0" eb="2"><t>ヤクワリ</t></rPh>',
-    parsedModel: { sb:0, eb:2, text: 'ヤクワリ'},
+    parsedModel: { sb: 0, eb: 2, text: 'ヤクワリ'},
     tests: ['render', 'renderIn', 'parse']
   }
 ];
 
-describe('PhoneticTextXform', function () {
+describe('PhoneticTextXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/strings/shared-string-xform.spec.js b/spec/unit/xlsx/xform/strings/shared-string-xform.spec.js
index c66199a96..bf9244259 100644
--- a/spec/unit/xlsx/xform/strings/shared-string-xform.spec.js
+++ b/spec/unit/xlsx/xform/strings/shared-string-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'text',
-    create:  function() { return new SharedStringXform(); },
+    create: function() { return new SharedStringXform(); },
     preparedModel: 'Hello, World!',
     xml: '<si><t>Hello, World!</t></si>',
     parsedModel: 'Hello, World!',
@@ -14,7 +14,7 @@ var expectations = [
   },
   {
     title: 'rich text',
-    create:  function() { return new SharedStringXform(); },
+    create: function() { return new SharedStringXform(); },
     preparedModel: {richText: [{ 'font': { 'size': 11, 'bold': true, 'color': { 'theme': 1}, 'name': 'Calibri', 'family': 2, 'scheme': 'minor' }, 'text': 'Bold,' }]},
     xml: '<si><r><rPr><b/><color theme="1"/><family val="2"/><scheme val="minor"/><sz val="11"/><rFont val="Calibri"/></rPr><t>Bold,</t></r></si>',
     parsedModel: {richText: [{ 'font': { 'size': 11, 'bold': true, 'color': { 'theme': 1}, 'name': 'Calibri', 'family': 2, 'scheme': 'minor' }, 'text': 'Bold,' }]},
@@ -22,7 +22,7 @@ var expectations = [
   },
   {
     title: 'text + phonetic',
-    create:  function() { return new SharedStringXform(); },
+    create: function() { return new SharedStringXform(); },
     preparedModel: {text: 'Hello, World!', phoneticText: { text: 'Helow woruld'} },
     xml: '<si><t>Hello, World!</t><rPh eb="0" sb="0"><t>Helow woruld</t></rPh></si>',
     parsedModel: 'Hello, World!',
@@ -30,14 +30,14 @@ var expectations = [
   },
   {
     title: 'Kanji + Katakana',
-    create:  function() { return new SharedStringXform(); },
-    preparedModel: {text: '役割', phoneticText: { sb:0, eb:2, text: 'ヤクワリ', properties:{ fontId: 1}} },
+    create: function() { return new SharedStringXform(); },
+    preparedModel: {text: '役割', phoneticText: { sb: 0, eb: 2, text: 'ヤクワリ', properties: { fontId: 1}} },
     xml: '<si><t>役割</t><rPh sb="0" eb="2"><t>ヤクワリ</t></rPh><phoneticPr fontId="1" /></si>',
     parsedModel: '役割',
     tests: ['parse']
   }
 ];
 
-describe('SharedStringXform', function () {
+describe('SharedStringXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/strings/shared-strings-xform.spec.js b/spec/unit/xlsx/xform/strings/shared-strings-xform.spec.js
index fc65fb6f8..2bff1aa2b 100644
--- a/spec/unit/xlsx/xform/strings/shared-strings-xform.spec.js
+++ b/spec/unit/xlsx/xform/strings/shared-strings-xform.spec.js
@@ -8,7 +8,7 @@ var testXformHelper = require('../test-xform-helper');
 var expectations = [
   {
     title: 'Shared Strings',
-    create:  function() { return new SharedStringsXform(); },
+    create: function() { return new SharedStringsXform(); },
     preparedModel: require('./data/sharedStrings.json'),
     xml: fs.readFileSync(__dirname + '/data/sharedStrings.xml').toString(),
     get parsedModel() { return this.preparedModel; },
@@ -16,6 +16,6 @@ var expectations = [
   }
 ];
 
-describe('SharedStringsXform', function () {
+describe('SharedStringsXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/alignment-xform.spec.js b/spec/unit/xlsx/xform/style/alignment-xform.spec.js
index 19815d237..f9bbde781 100644
--- a/spec/unit/xlsx/xform/style/alignment-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/alignment-xform.spec.js
@@ -6,14 +6,14 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Empty',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: {},
     xml: '',
     tests: ['render', 'renderIn']
   },
   {
     title: 'Top Left',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'left', vertical: 'top' },
     xml: '<alignment horizontal="left" vertical="top"/>',
     get parsedModel() { return this.preparedModel; },
@@ -21,7 +21,7 @@ var expectations = [
   },
   {
     title: 'Middle Centre',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'center', vertical: 'middle' },
     xml: '<alignment horizontal="center" vertical="center"/>',
     get parsedModel() { return this.preparedModel; },
@@ -29,7 +29,7 @@ var expectations = [
   },
   {
     title: 'Bottom Right',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom'},
     xml: '<alignment horizontal="right" vertical="bottom"/>',
     get parsedModel() { return this.preparedModel; },
@@ -37,7 +37,7 @@ var expectations = [
   },
   {
     title: 'Wrap Text',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { wrapText: true },
     xml: '<alignment wrapText="1"/>',
     get parsedModel() { return this.preparedModel; },
@@ -45,7 +45,7 @@ var expectations = [
   },
   {
     title: 'Indent 1',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { indent: 1 },
     xml: '<alignment indent="1"/>',
     get parsedModel() { return this.preparedModel; },
@@ -53,7 +53,7 @@ var expectations = [
   },
   {
     title: 'Indent 2',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { indent: 2 },
     xml: '<alignment indent="2"/>',
     get parsedModel() { return this.preparedModel; },
@@ -61,7 +61,7 @@ var expectations = [
   },
   {
     title: 'Rotate 15',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: 15 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="15"/>',
     get parsedModel() { return this.preparedModel; },
@@ -69,7 +69,7 @@ var expectations = [
   },
   {
     title: 'Rotate 30',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: 30 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="30"/>',
     get parsedModel() { return this.preparedModel; },
@@ -77,7 +77,7 @@ var expectations = [
   },
   {
     title: 'Rotate 45',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: 45 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="45"/>',
     get parsedModel() { return this.preparedModel; },
@@ -85,7 +85,7 @@ var expectations = [
   },
   {
     title: 'Rotate 60',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: 60 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="60"/>',
     get parsedModel() { return this.preparedModel; },
@@ -93,7 +93,7 @@ var expectations = [
   },
   {
     title: 'Rotate 75',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: 75 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="75"/>',
     get parsedModel() { return this.preparedModel; },
@@ -101,7 +101,7 @@ var expectations = [
   },
   {
     title: 'Rotate 90',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: 90 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="90"/>',
     get parsedModel() { return this.preparedModel; },
@@ -109,7 +109,7 @@ var expectations = [
   },
   {
     title: 'Rotate -15',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: -15 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="105"/>',
     get parsedModel() { return this.preparedModel; },
@@ -117,7 +117,7 @@ var expectations = [
   },
   {
     title: 'Rotate -30',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: -30 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="120"/>',
     get parsedModel() { return this.preparedModel; },
@@ -125,7 +125,7 @@ var expectations = [
   },
   {
     title: 'Rotate -45',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: -45 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="135"/>',
     get parsedModel() { return this.preparedModel; },
@@ -133,7 +133,7 @@ var expectations = [
   },
   {
     title: 'Rotate -60',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: -60 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="150"/>',
     get parsedModel() { return this.preparedModel; },
@@ -141,7 +141,7 @@ var expectations = [
   },
   {
     title: 'Rotate -75',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: -75 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="165"/>',
     get parsedModel() { return this.preparedModel; },
@@ -149,7 +149,7 @@ var expectations = [
   },
   {
     title: 'Rotate -90',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: -90 },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="180"/>',
     get parsedModel() { return this.preparedModel; },
@@ -157,7 +157,7 @@ var expectations = [
   },
   {
     title: 'Vertical Text',
-    create:  function() { return new AlignmentXform()},
+    create: () => new AlignmentXform(),
     preparedModel: { horizontal: 'right', vertical: 'bottom', textRotation: 'vertical' },
     xml: '<alignment horizontal="right" vertical="bottom" textRotation="255"/>',
     get parsedModel() { return this.preparedModel; },
@@ -165,6 +165,6 @@ var expectations = [
   }
 ];
 
-describe('AlignmentXform', function () {
+describe('AlignmentXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/border-xform.spec.js b/spec/unit/xlsx/xform/style/border-xform.spec.js
index 5bbbe410f..1bf704687 100644
--- a/spec/unit/xlsx/xform/style/border-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/border-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Empty',
-    create:  function() { return new BorderXform()},
+    create: function() { return new BorderXform(); },
     preparedModel: {},
     xml: '<border><left/><right/><top/><bottom/><diagonal/></border>',
     get parsedModel() { return this.preparedModel; },
@@ -14,12 +14,12 @@ var expectations = [
   },
   {
     title: 'Thin Red Box',
-    create:  function() { return new BorderXform()},
+    create: function() { return new BorderXform(); },
     preparedModel: {
-      left: { color: {argb:'FFFF0000'}, style: 'thin' },
-      right: { color: {argb:'FFFF0000'}, style: 'thin' },
-      top: { color: {argb:'FFFF0000'}, style: 'thin' },
-      bottom: { color: {argb:'FFFF0000'}, style: 'thin' }
+      left: { color: {argb: 'FFFF0000'}, style: 'thin' },
+      right: { color: {argb: 'FFFF0000'}, style: 'thin' },
+      top: { color: {argb: 'FFFF0000'}, style: 'thin' },
+      bottom: { color: {argb: 'FFFF0000'}, style: 'thin' }
     },
     xml: '<border><left style="thin"><color rgb="FFFF0000"/></left><right style="thin"><color rgb="FFFF0000"/></right><top style="thin"><color rgb="FFFF0000"/></top><bottom style="thin"><color rgb="FFFF0000"/></bottom><diagonal/></border>',
     get parsedModel() { return this.preparedModel; },
@@ -27,7 +27,7 @@ var expectations = [
   },
   {
     title: 'Dotted colourless Box',
-    create:  function() { return new BorderXform()},
+    create: function() { return new BorderXform(); },
     preparedModel: {
       left: { style: 'dotted' },
       right: { style: 'dotted' },
@@ -40,7 +40,7 @@ var expectations = [
   },
   {
     title: 'Cross',
-    create:  function() { return new BorderXform()},
+    create: function() { return new BorderXform(); },
     preparedModel: {diagonal: {style: 'thin', up: true, down: true}},
     xml: '<border diagonalUp="1" diagonalDown="1"><left/><right/><top/><bottom/><diagonal style="thin"/></border>',
     get parsedModel() { return this.preparedModel; },
@@ -48,30 +48,30 @@ var expectations = [
   },
   {
     title: 'Missing Style',
-    create:  function() { return new BorderXform()},
+    create: function() { return new BorderXform(); },
     preparedModel: {
-      left: { color: {argb:'FFFF0000'} },
-      right: { color: {argb:'FFFF0000'} },
-      top: { color: {argb:'FFFF0000'}, style: 'medium' },
-      bottom: { color: {argb:'FFFF0000'}, style: 'medium' }
+      left: { color: {argb: 'FFFF0000'} },
+      right: { color: {argb: 'FFFF0000'} },
+      top: { color: {argb: 'FFFF0000'}, style: 'medium' },
+      bottom: { color: {argb: 'FFFF0000'}, style: 'medium' }
     },
     xml: '<border><left/><right/><top style="medium"><color rgb="FFFF0000"/></top><bottom style="medium"><color rgb="FFFF0000"/></bottom><diagonal/></border>',
     tests: ['render', 'renderIn']
   },
   {
     title: 'Missing Style',
-    create:  function() { return new BorderXform()},
+    create: function() { return new BorderXform(); },
     xml: '<border><left><color rgb="FFFF0000"/></left><right><color rgb="FFFF0000"/></right><top style="medium"><color rgb="FFFF0000"/></top><bottom style="medium"><color rgb="FFFF0000"/></bottom><diagonal/></border>',
     parsedModel: {
-      left: { color: {argb:'FFFF0000'} },
-      right: { color: {argb:'FFFF0000'} },
-      top: { color: {argb:'FFFF0000'}, style: 'medium' },
-      bottom: { color: {argb:'FFFF0000'}, style: 'medium' }
+      left: { color: {argb: 'FFFF0000'} },
+      right: { color: {argb: 'FFFF0000'} },
+      top: { color: {argb: 'FFFF0000'}, style: 'medium' },
+      bottom: { color: {argb: 'FFFF0000'}, style: 'medium' }
     },
     tests: ['parse']
   }
 ];
 
-describe('BorderXform', function () {
+describe('BorderXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/color-xform.spec.js b/spec/unit/xlsx/xform/style/color-xform.spec.js
index ee4206064..bea108aa6 100644
--- a/spec/unit/xlsx/xform/style/color-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/color-xform.spec.js
@@ -6,39 +6,39 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'RGB',
-    create:  function() { return new ColorXform()},
-    preparedModel: {argb:'FF00FF00'},
+    create: () => new ColorXform(),
+    preparedModel: {argb: 'FF00FF00'},
     xml: '<color rgb="FF00FF00"/>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Theme',
-    create:  function() { return new ColorXform()},
-    preparedModel: {theme:1},
+    create: () => new ColorXform(),
+    preparedModel: {theme: 1},
     xml: '<color theme="1"/>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Theme with Tint',
-    create:  function() { return new ColorXform()},
-    preparedModel: {theme:1, tint: 0.5},
+    create: () => new ColorXform(),
+    preparedModel: {theme: 1, tint: 0.5},
     xml: '<color theme="1" tint="0.5"/>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Theme with Tint Zero',
-    create:  function() { return new ColorXform()},
-    preparedModel: {theme:0, tint: 0},
+    create: () => new ColorXform(),
+    preparedModel: {theme: 0, tint: 0},
     xml: '<color theme="0" tint="0"/>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Indexed',
-    create:  function() { return new ColorXform()},
+    create: () => new ColorXform(),
     preparedModel: {indexed: 1},
     xml: '<color indexed="1"/>',
     get parsedModel() { return this.preparedModel; },
@@ -46,7 +46,7 @@ var expectations = [
   },
   {
     title: 'Indexed Zero',
-    create:  function() { return new ColorXform()},
+    create: () => new ColorXform(),
     preparedModel: {indexed: 0},
     xml: '<color indexed="0"/>',
     get parsedModel() { return this.preparedModel; },
@@ -54,13 +54,13 @@ var expectations = [
   },
   {
     title: 'Undefined',
-    create:  function() { return new ColorXform()},
+    create: () => new ColorXform(),
     preparedModel: undefined,
     xml: '',
     tests: ['render', 'renderIn']
   }
 ];
 
-describe('ColorXform', function () {
+describe('ColorXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/fill-xform.spec.js b/spec/unit/xlsx/xform/style/fill-xform.spec.js
index c4c160ee8..4125cabb8 100644
--- a/spec/unit/xlsx/xform/style/fill-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/fill-xform.spec.js
@@ -6,50 +6,53 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Empty',
-    create:  function() { return new FillXform()},
+    create: function() { return new FillXform(); },
     preparedModel: {},
     xml: '',
     tests: ['render', 'renderIn']
   },
   {
     title: 'None',
-    create:  function() { return new FillXform()},
-    preparedModel: {type: 'pattern', pattern:'none'},
+    create: function() { return new FillXform(); },
+    preparedModel: {type: 'pattern', pattern: 'none'},
     xml: '<fill><patternFill patternType="none"/></fill>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Gray 125',
-    create:  function() { return new FillXform()},
-    preparedModel: {type: 'pattern', pattern:'gray125'},
+    create: function() { return new FillXform(); },
+    preparedModel: {type: 'pattern', pattern: 'gray125'},
     xml: '<fill><patternFill patternType="gray125"/></fill>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Red Dark Vertical Pattern',
-    create:  function() { return new FillXform()},
-    preparedModel: {type: 'pattern', pattern:'darkVertical', fgColor:{argb:'FFFF0000'}},
+    create: function() { return new FillXform(); },
+    preparedModel: {type: 'pattern', pattern: 'darkVertical', fgColor: {argb: 'FFFF0000'}},
     xml: '<fill><patternFill patternType="darkVertical"><fgColor rgb="FFFF0000"/></patternFill></fill>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Red Green Dark Trellis Pattern',
-    create:  function() { return new FillXform()},
-    preparedModel: {type: 'pattern', pattern:'darkTrellis', fgColor:{argb:'FFFF0000'}, bgColor:{argb:'FF00FF00'}},
+    create: function() { return new FillXform(); },
+    preparedModel: {type: 'pattern', pattern: 'darkTrellis', fgColor: {argb: 'FFFF0000'}, bgColor: {argb: 'FF00FF00'}},
     xml: '<fill><patternFill patternType="darkTrellis"><fgColor rgb="FFFF0000"/><bgColor rgb="FF00FF00"/></patternFill></fill>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Blue White Horizontal Gradient',
-    create:  function() { return new FillXform()},
-    preparedModel: {type: 'gradient', gradient: 'angle', degree: 0,
+    create: function() { return new FillXform(); },
+    preparedModel: {
+      type: 'gradient',
+      gradient: 'angle',
+      degree: 0,
       stops: [
-        {position:0, color:{argb:'FF0000FF'}},
-        {position:1, color:{argb:'FFFFFFFF'}}
+        {position: 0, color: {argb: 'FF0000FF'}},
+        {position: 1, color: {argb: 'FFFFFFFF'}}
       ]
     },
     xml: '<fill><gradientFill degree="0">' +
@@ -61,12 +64,15 @@ var expectations = [
   },
   {
     title: 'RGB Path Gradient',
-    create:  function() { return new FillXform()},
-    preparedModel: {type: 'gradient', gradient: 'path', center:{left:0.5,top:0.5},
+    create: function() { return new FillXform(); },
+    preparedModel: {
+      type: 'gradient',
+      gradient: 'path',
+      center: {left: 0.5, top: 0.5},
       stops: [
-        {position:0, color:{argb:'FFFF0000'}},
-        {position:0.5, color:{argb:'FF00FF00'}},
-        {position:1, color:{argb:'FF0000FF'}}
+        {position: 0, color: {argb: 'FFFF0000'}},
+        {position: 0.5, color: {argb: 'FF00FF00'}},
+        {position: 1, color: {argb: 'FF0000FF'}}
       ]
     },
     xml: '<fill><gradientFill type="path" left="0.5" right="0.5" top="0.5" bottom="0.5">' +
@@ -79,6 +85,6 @@ var expectations = [
   }
 ];
 
-describe('FillXform', function () {
+describe('FillXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/font-xform.spec.js b/spec/unit/xlsx/xform/style/font-xform.spec.js
index 5af212580..5e749b5e8 100644
--- a/spec/unit/xlsx/xform/style/font-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/font-xform.spec.js
@@ -8,21 +8,21 @@ var expectations = [
   {
     title: 'green bold',
     create: function() { return new FontXform(); },
-    preparedModel: {bold: true, size: 14, color: {argb:'FF00FF00'}, name: 'Calibri', family: 2, scheme: 'minor'},
+    preparedModel: {bold: true, size: 14, color: {argb: 'FF00FF00'}, name: 'Calibri', family: 2, scheme: 'minor'},
     xml: '<font><b/><color rgb="FF00FF00"/><family val="2"/><scheme val="minor"/><sz val="14"/><name val="Calibri"/></font>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'rPr tag',
-    create: function() { return new FontXform({tagName: 'rPr',fontNameTag:  'rFont'}); },
-    preparedModel: {italic: true, size: 14, color: {argb:'FF00FF00'}, name: 'Calibri', family: 2, scheme: 'minor'},
+    create: function() { return new FontXform({tagName: 'rPr', fontNameTag: 'rFont'}); },
+    preparedModel: {italic: true, size: 14, color: {argb: 'FF00FF00'}, name: 'Calibri', family: 2, scheme: 'minor'},
     xml: '<rPr><i/><color rgb="FF00FF00"/><family val="2"/><scheme val="minor"/><sz val="14"/><rFont val="Calibri"/></rPr>',
     get parsedModel() { return this.preparedModel; },
     tests: ['render', 'renderIn', 'parse']
   }
 ];
 
-describe('FontXform', function () {
+describe('FontXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/numfmt-xform.spec.js b/spec/unit/xlsx/xform/style/numfmt-xform.spec.js
index da80ec6fe..5f7fd962c 100644
--- a/spec/unit/xlsx/xform/style/numfmt-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/numfmt-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'date',
-    create:  () => new NumFmtXform(),
+    create: () => new NumFmtXform(),
     preparedModel: {id: 165, formatCode: 'd-mmm-yyyy'},
     xml: '<numFmt numFmtId="165" formatCode="d-mmm-yyyy"/>',
     get parsedModel() { return this.preparedModel; },
@@ -14,7 +14,7 @@ var expectations = [
   },
   {
     title: 'thing',
-    create:  () => new NumFmtXform(),
+    create: () => new NumFmtXform(),
     preparedModel: {id: 165, formatCode: '[Green]#,##0 ;[Red](#,##0)'},
     xml: '<numFmt numFmtId="165" formatCode="[Green]#,##0 ;[Red](#,##0)"/>',
     get parsedModel() { return this.preparedModel; },
@@ -22,6 +22,6 @@ var expectations = [
   }
 ];
 
-describe('NumFmtXform', function () {
+describe('NumFmtXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/style-xform.spec.js b/spec/unit/xlsx/xform/style/style-xform.spec.js
index c3c7b1300..893f064fb 100644
--- a/spec/unit/xlsx/xform/style/style-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/style-xform.spec.js
@@ -6,70 +6,70 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Default',
-    create:  function() { return new StyleXform()},
+    create: function() { return new StyleXform(); },
     preparedModel: {numFmtId: 0, fontId: 0, fillId: 0, borderId: 0},
     xml: '<xf numFmtId="0" fontId="0" fillId="0" borderId="0"/>',
     get parsedModel() { return this.preparedModel; },
-    tests:['render', 'renderIn', 'parse']
+    tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Default with xfId',
-    create:  function() { return new StyleXform({xfId: true})},
+    create: function() { return new StyleXform({xfId: true}); },
     preparedModel: {numFmtId: 0, fontId: 0, fillId: 0, borderId: 0, xfId: 0},
     xml: '<xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>',
     get parsedModel() { return this.preparedModel; },
-    tests:['render', 'renderIn', 'parse']
+    tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Aligned',
-    create:  function() { return new StyleXform({xfId: true})},
+    create: function() { return new StyleXform({xfId: true}); },
     preparedModel: {numFmtId: 0, fontId: 0, fillId: 0, borderId: 0, xfId: 0, alignment: { horizontal: 'center', vertical: 'middle' }},
     xml: '<xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyAlignment="1"><alignment horizontal="center" vertical="center"/></xf>',
     get parsedModel() { return this.preparedModel; },
-    tests:['render', 'renderIn', 'parse']
+    tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Font',
-    create:  function() { return new StyleXform({xfId: true})},
+    create: function() { return new StyleXform({xfId: true}); },
     preparedModel: {numFmtId: 0, fontId: 5, fillId: 0, borderId: 0, xfId: 0},
     xml: '<xf numFmtId="0" fontId="5" fillId="0" borderId="0" xfId="0" applyFont="1"/>',
     get parsedModel() { return this.preparedModel; },
-    tests:['render', 'renderIn', 'parse']
+    tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Border',
-    create:  function() { return new StyleXform({xfId: true})},
+    create: function() { return new StyleXform({xfId: true}); },
     preparedModel: {numFmtId: 0, fontId: 0, fillId: 0, borderId: 7, xfId: 0},
     xml: '<xf numFmtId="0" fontId="0" fillId="0" borderId="7" xfId="0" applyBorder="1"/>',
     get parsedModel() { return this.preparedModel; },
-    tests:['render', 'renderIn', 'parse']
+    tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'NumFmt',
-    create:  function() { return new StyleXform({xfId: true})},
+    create: function() { return new StyleXform({xfId: true}); },
     preparedModel: {numFmtId: 1, fontId: 0, fillId: 0, borderId: 0, xfId: 0},
     xml: '<xf numFmtId="1" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>',
     get parsedModel() { return this.preparedModel; },
-    tests:['render', 'renderIn', 'parse']
+    tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Fill',
-    create:  function() { return new StyleXform({xfId: true})},
+    create: function() { return new StyleXform({xfId: true}); },
     preparedModel: {numFmtId: 0, fontId: 0, fillId: 2, borderId: 0, xfId: 0},
     xml: '<xf numFmtId="0" fontId="0" fillId="2" borderId="0" xfId="0" applyFill="1"/>',
     get parsedModel() { return this.preparedModel; },
-    tests:['render', 'renderIn', 'parse']
+    tests: ['render', 'renderIn', 'parse']
   },
   {
     title: 'Protected',
-    create:  function() { return new StyleXform({xfId: true})},
+    create: function() { return new StyleXform({xfId: true}); },
     preparedModel: {numFmtId: 0, fontId: 0, fillId: 0, borderId: 0, xfId: 0, alignment: { horizontal: 'center', vertical: 'middle' }},
     xml: '<xf borderId="1" fillId="10" fontId="3" numFmtId="0" xfId="0" applyProtection="1" applyAlignment="1" applyFill="1" applyBorder="1" applyFont="1"><protection locked="0"/><alignment horizontal="center" vertical="center"/></xf>',
     parsedModel: {borderId: 1, fillId: 10, fontId: 3, numFmtId: 0, xfId: 0, alignment: { horizontal: 'center', vertical: 'middle' }},
-    tests:['parse', 'parseIn']
+    tests: ['parse', 'parseIn']
   }
 ];
 
-describe('StyleXform', function () {
+describe('StyleXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/styles-xform.spec.js b/spec/unit/xlsx/xform/style/styles-xform.spec.js
index 515fd3bf4..356d665c3 100644
--- a/spec/unit/xlsx/xform/style/styles-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/styles-xform.spec.js
@@ -8,7 +8,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'Styles',
-    create:  function() { return new StylesXform()},
+    create: function() { return new StylesXform(); },
     preparedModel: require('./data/styles.1.json'),
     xml: fs.readFileSync(__dirname + '/data/styles.1.xml').toString(),
     get parsedModel() { return this.preparedModel; },
@@ -16,6 +16,6 @@ var expectations = [
   }
 ];
 
-describe('StylesXform', function () {
+describe('StylesXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/style/underline-xform.spec.js b/spec/unit/xlsx/xform/style/underline-xform.spec.js
index b2907d9b2..b027dc65e 100644
--- a/spec/unit/xlsx/xform/style/underline-xform.spec.js
+++ b/spec/unit/xlsx/xform/style/underline-xform.spec.js
@@ -6,7 +6,7 @@ var testXformHelper = require('./../test-xform-helper');
 var expectations = [
   {
     title: 'single',
-    create:  function() { return new UnderlineXform()},
+    create: function() { return new UnderlineXform(); },
     preparedModel: true,
     get parsedModel() { return this.preparedModel; },
     xml: '<u/>',
@@ -14,7 +14,7 @@ var expectations = [
   },
   {
     title: 'double',
-    create:  function() { return new UnderlineXform()},
+    create: function() { return new UnderlineXform(); },
     preparedModel: 'double',
     get parsedModel() { return this.preparedModel; },
     xml: '<u val="double"/>',
@@ -22,7 +22,7 @@ var expectations = [
   },
   {
     title: 'false',
-    create:  function() { return new UnderlineXform()},
+    create: function() { return new UnderlineXform(); },
     preparedModel: false,
     get parsedModel() { return this.preparedModel; },
     xml: '',
@@ -30,6 +30,6 @@ var expectations = [
   }
 ];
 
-describe('UnderlineXform', function () {
+describe('UnderlineXform', function() {
   testXformHelper(expectations);
 });
diff --git a/spec/unit/xlsx/xform/test-xform-helper.js b/spec/unit/xlsx/xform/test-xform-helper.js
index b5c22fc9e..30a623944 100644
--- a/spec/unit/xlsx/xform/test-xform-helper.js
+++ b/spec/unit/xlsx/xform/test-xform-helper.js
@@ -41,8 +41,8 @@ var its = {
   },
 
   render: function(expectation) {
-    it('Render to XML', function () {
-      return new Promise(function (resolve) {
+    it('Render to XML', function() {
+      return new Promise(function(resolve) {
         var model = getExpectation(expectation, 'preparedModel');
         var result = getExpectation(expectation, 'xml');
 
@@ -59,8 +59,8 @@ var its = {
 
   'prepare-render': function(expectation) {
     // when implementation details get in the way of testing the prepared result
-    it('Prepare and Render to XML', function () {
-      return new Promise(function (resolve) {
+    it('Prepare and Render to XML', function() {
+      return new Promise(function(resolve) {
         var model = getExpectation(expectation, 'initialModel');
         var result = getExpectation(expectation, 'xml');
 
@@ -77,8 +77,8 @@ var its = {
   },
 
   renderIn: function(expectation) {
-    it('Render in Composite to XML ', function () {
-      return new Promise(function (resolve) {
+    it('Render in Composite to XML ', function() {
+      return new Promise(function(resolve) {
         var model = {
           pre: true,
           child: getExpectation(expectation, 'preparedModel'),
@@ -112,7 +112,7 @@ var its = {
   
   parseIn: function(expectation) {
     it('Parse within composite', function() {
-      return new Promise(function (resolve, reject) {
+      return new Promise(function(resolve, reject) {
         var xml = '<compy><pre/>' + getExpectation(expectation, 'xml') + '<post/></compy>';
         var childXform = expectation.create();
         var result = {pre: true};
@@ -129,7 +129,7 @@ var its = {
         var parser = Sax.createStream(true);
 
         xform.parse(parser)
-          .then(function (model) {
+          .then(function(model) {
             // console.log('parsed Model', JSON.stringify(model));
             // console.log('expected Model', JSON.stringify(result));
 
@@ -148,8 +148,8 @@ var its = {
   },
 
   parse: function(expectation) {
-    it('Parse to Model', function () {
-      return new Promise(function (resolve, reject) {
+    it('Parse to Model', function() {
+      return new Promise(function(resolve, reject) {
         var xml = getExpectation(expectation, 'xml');
         var result = getExpectation(expectation, 'parsedModel');
 
@@ -157,7 +157,7 @@ var its = {
         var xform = expectation.create();
 
         xform.parse(parser)
-          .then(function (model) {
+          .then(function(model) {
             // eliminate the undefined
             var clone = _.cloneDeep(model, false);
 
@@ -193,9 +193,9 @@ var its = {
 };
 
 function testXform(expectations) {
-  _.each(expectations, function (expectation) {
+  _.each(expectations, function(expectation) {
     var tests = getExpectation(expectation, 'tests');
-    describe(expectation.title, function () {
+    describe(expectation.title, function() {
       _.each(tests, function(test) {
         its[test](expectation);
       });
diff --git a/spec/utils/index.js b/spec/utils/index.js
index 37b870e0d..61908c0f4 100644
--- a/spec/utils/index.js
+++ b/spec/utils/index.js
@@ -19,7 +19,7 @@ var testSheets = {
 
 function getOptions(docType, options) {
   var result;
-  switch(docType) {
+  switch (docType) {
     case 'xlsx':
       result = {
         sheetName: 'values',
diff --git a/spec/utils/test-spliced-sheet.js b/spec/utils/test-spliced-sheet.js
index d3a584a34..2252b1f4c 100644
--- a/spec/utils/test-spliced-sheet.js
+++ b/spec/utils/test-spliced-sheet.js
@@ -17,7 +17,7 @@ module.exports = {
         ws.getCell('C4').value = 4.3;
         ws.addRow(['5,1', '5,2', '5,3']);
 
-        ws.spliceRows(2,1);
+        ws.spliceRows(2, 1);
       },
 
       checkSheet: function(wb, options) {
@@ -67,17 +67,17 @@ module.exports = {
         ws.getCell('C4').value = 4.3;
         ws.addRow(['5,1', '5,2', '5,3']);
 
-        ws.spliceRows(2,2, ['one', 'two', 'three']);
+        ws.spliceRows(2, 2, ['one', 'two', 'three']);
       },
 
       checkSheet: function(wb, options) {
         var ws = wb.getWorksheet('splice-row-insert-fewer');
         expect(ws).to.not.be.undefined();
 
-        expect(ws.getRow(1).values).to.deep.equal([,'1,1', '1,2', '1,3']);
-        expect(ws.getRow(2).values).to.deep.equal([,'one', 'two', 'three']);
-        expect(ws.getRow(3).values).to.deep.equal([,4.1,,4.3]);
-        expect(ws.getRow(4).values).to.deep.equal([,'5,1', '5,2', '5,3']);
+        expect(ws.getRow(1).values).to.deep.equal([, '1,1', '1,2', '1,3']);
+        expect(ws.getRow(2).values).to.deep.equal([, 'one', 'two', 'three']);
+        expect(ws.getRow(3).values).to.deep.equal([, 4.1,, 4.3]);
+        expect(ws.getRow(4).values).to.deep.equal([, '5,1', '5,2', '5,3']);
       }
     },
     insertSame: {
@@ -90,18 +90,18 @@ module.exports = {
         ws.getCell('C4').value = 4.3;
         ws.addRow(['5,1', '5,2', '5,3']);
 
-        ws.spliceRows(2,2, ['one', 'two', 'three'], ['une', 'deux', 'trois']);
+        ws.spliceRows(2, 2, ['one', 'two', 'three'], ['une', 'deux', 'trois']);
       },
 
       checkSheet: function(wb, options) {
         var ws = wb.getWorksheet('splice-row-insert-same');
         expect(ws).to.not.be.undefined();
 
-        expect(ws.getRow(1).values).to.deep.equal([,'1,1', '1,2', '1,3']);
-        expect(ws.getRow(2).values).to.deep.equal([,'one', 'two', 'three']);
-        expect(ws.getRow(3).values).to.deep.equal([,'une', 'deux', 'trois']);
-        expect(ws.getRow(4).values).to.deep.equal([,4.1,,4.3]);
-        expect(ws.getRow(5).values).to.deep.equal([,'5,1', '5,2', '5,3']);
+        expect(ws.getRow(1).values).to.deep.equal([, '1,1', '1,2', '1,3']);
+        expect(ws.getRow(2).values).to.deep.equal([, 'one', 'two', 'three']);
+        expect(ws.getRow(3).values).to.deep.equal([, 'une', 'deux', 'trois']);
+        expect(ws.getRow(4).values).to.deep.equal([, 4.1,, 4.3]);
+        expect(ws.getRow(5).values).to.deep.equal([, '5,1', '5,2', '5,3']);
       }
     },
     insertMore: {
@@ -114,19 +114,19 @@ module.exports = {
         ws.getCell('C4').value = 4.3;
         ws.addRow(['5,1', '5,2', '5,3']);
 
-        ws.spliceRows(2,2, ['one', 'two', 'three'], ['une', 'deux', 'trois'], ['uno', 'due', 'tre']);
+        ws.spliceRows(2, 2, ['one', 'two', 'three'], ['une', 'deux', 'trois'], ['uno', 'due', 'tre']);
       },
 
       checkSheet: function(wb, options) {
         var ws = wb.getWorksheet('splice-row-insert-more');
         expect(ws).to.not.be.undefined();
 
-        expect(ws.getRow(1).values).to.deep.equal([,'1,1', '1,2', '1,3']);
-        expect(ws.getRow(2).values).to.deep.equal([,'one', 'two', 'three']);
-        expect(ws.getRow(3).values).to.deep.equal([,'une', 'deux', 'trois']);
-        expect(ws.getRow(4).values).to.deep.equal([,'uno', 'due', 'tre']);
-        expect(ws.getRow(5).values).to.deep.equal([,4.1,,4.3]);
-        expect(ws.getRow(6).values).to.deep.equal([,'5,1', '5,2', '5,3']);
+        expect(ws.getRow(1).values).to.deep.equal([, '1,1', '1,2', '1,3']);
+        expect(ws.getRow(2).values).to.deep.equal([, 'one', 'two', 'three']);
+        expect(ws.getRow(3).values).to.deep.equal([, 'une', 'deux', 'trois']);
+        expect(ws.getRow(4).values).to.deep.equal([, 'uno', 'due', 'tre']);
+        expect(ws.getRow(5).values).to.deep.equal([, 4.1,, 4.3]);
+        expect(ws.getRow(6).values).to.deep.equal([, '5,1', '5,2', '5,3']);
       }
     }
   },
@@ -141,9 +141,9 @@ module.exports = {
           { key: 'dob', width: 10 }
         ];
 
-        ws.addRow({id: 'id1', name: 'name1', dob:'dob1'});
-        ws.addRow({id: 2, dob:'dob2'});
-        ws.addRow({name: 'name3', dob:3});
+        ws.addRow({id: 'id1', name: 'name1', dob: 'dob1'});
+        ws.addRow({id: 2, dob: 'dob2'});
+        ws.addRow({name: 'name3', dob: 3});
 
         ws.spliceColumns(2, 1);
       },
@@ -181,18 +181,18 @@ module.exports = {
         ws.getCell('E4').value = 4.5;
         ws.addRow(['5,1', '5,2', '5,3', '5,4', '5,5']);
 
-        ws.spliceColumns(2,2, ['one', 'two', 'three', 'four', 'five']);
+        ws.spliceColumns(2, 2, ['one', 'two', 'three', 'four', 'five']);
       },
 
       checkSheet: function(wb, options) {
         var ws = wb.getWorksheet('splice-column-insert-fewer');
         expect(ws).to.not.be.undefined();
 
-        expect(ws.getRow(1).values).to.deep.equal([,'1,1', 'one', '1,4', '1,5']);
-        expect(ws.getRow(2).values).to.deep.equal([,'2,1', 'two', '2,4', '2,5']);
-        expect(ws.getRow(3).values).to.deep.equal([,,'three',,]);
-        expect(ws.getRow(4).values).to.deep.equal([,4.1,'four',,4.5]);
-        expect(ws.getRow(5).values).to.deep.equal([,'5,1', 'five', '5,4', '5,5']);
+        expect(ws.getRow(1).values).to.deep.equal([, '1,1', 'one', '1,4', '1,5']);
+        expect(ws.getRow(2).values).to.deep.equal([, '2,1', 'two', '2,4', '2,5']);
+        expect(ws.getRow(3).values).to.deep.equal([, , 'three', , ]);
+        expect(ws.getRow(4).values).to.deep.equal([, 4.1, 'four',, 4.5]);
+        expect(ws.getRow(5).values).to.deep.equal([, '5,1', 'five', '5,4', '5,5']);
       }
     },
     insertSame: {
@@ -206,7 +206,7 @@ module.exports = {
         ws.getCell('E4').value = 4.5;
         ws.addRow(['5,1', '5,2', '5,3', '5,4', '5,5']);
 
-        ws.spliceColumns(2,2,
+        ws.spliceColumns(2, 2,
           ['one', 'two', 'three', 'four', 'five'],
           ['une', 'deux', 'trois', 'quatre', 'cinq']
         );
@@ -216,11 +216,11 @@ module.exports = {
         var ws = wb.getWorksheet('splice-column-insert-same');
         expect(ws).to.not.be.undefined();
 
-        expect(ws.getRow(1).values).to.deep.equal([,'1,1', 'one', 'une', '1,4', '1,5']);
-        expect(ws.getRow(2).values).to.deep.equal([,'2,1', 'two', 'deux', '2,4', '2,5']);
-        expect(ws.getRow(3).values).to.deep.equal([,,'three', 'trois',,]);
-        expect(ws.getRow(4).values).to.deep.equal([,4.1,'four','quatre',,4.5]);
-        expect(ws.getRow(5).values).to.deep.equal([,'5,1', 'five', 'cinq', '5,4', '5,5']);
+        expect(ws.getRow(1).values).to.deep.equal([, '1,1', 'one', 'une', '1,4', '1,5']);
+        expect(ws.getRow(2).values).to.deep.equal([, '2,1', 'two', 'deux', '2,4', '2,5']);
+        expect(ws.getRow(3).values).to.deep.equal([,, 'three', 'trois', , ]);
+        expect(ws.getRow(4).values).to.deep.equal([, 4.1, 'four', 'quatre',, 4.5]);
+        expect(ws.getRow(5).values).to.deep.equal([, '5,1', 'five', 'cinq', '5,4', '5,5']);
       }
     },
     insertMore: {
@@ -234,7 +234,7 @@ module.exports = {
         ws.getCell('E4').value = 4.5;
         ws.addRow(['5,1', '5,2', '5,3', '5,4', '5,5']);
 
-        ws.spliceColumns(2,2,
+        ws.spliceColumns(2, 2,
           ['one', 'two', 'three', 'four', 'five'],
           ['une', 'deux', 'trois', 'quatre', 'cinq'],
           ['uno', 'due', 'tre', 'quatro', 'cinque']
@@ -245,11 +245,11 @@ module.exports = {
         var ws = wb.getWorksheet('splice-column-insert-more');
         expect(ws).to.not.be.undefined();
 
-        expect(ws.getRow(1).values).to.deep.equal([,'1,1', 'one', 'une', 'uno', '1,4', '1,5']);
-        expect(ws.getRow(2).values).to.deep.equal([,'2,1', 'two', 'deux', 'due', '2,4', '2,5']);
-        expect(ws.getRow(3).values).to.deep.equal([,,'three', 'trois','tre',]);
-        expect(ws.getRow(4).values).to.deep.equal([,4.1,'four','quatre','quatro',,4.5]);
-        expect(ws.getRow(5).values).to.deep.equal([,'5,1', 'five', 'cinq', 'cinque', '5,4','5,5']);
+        expect(ws.getRow(1).values).to.deep.equal([, '1,1', 'one', 'une', 'uno', '1,4', '1,5']);
+        expect(ws.getRow(2).values).to.deep.equal([, '2,1', 'two', 'deux', 'due', '2,4', '2,5']);
+        expect(ws.getRow(3).values).to.deep.equal([,, 'three', 'trois', 'tre', ]);
+        expect(ws.getRow(4).values).to.deep.equal([, 4.1, 'four', 'quatre', 'quatro',, 4.5]);
+        expect(ws.getRow(5).values).to.deep.equal([, '5,1', 'five', 'cinq', 'cinque', '5,4', '5,5']);
       }
     }
   }
diff --git a/spec/utils/test-values-sheet.js b/spec/utils/test-values-sheet.js
index b7d92a870..621824550 100644
--- a/spec/utils/test-values-sheet.js
+++ b/spec/utils/test-values-sheet.js
@@ -17,7 +17,7 @@ var self = module.exports = {
     // call it sheet1 so this sheet can be used for csv testing
     var ws = wb.addWorksheet('sheet1', {
       properties: self.properties,
-      pageSetup:  self.pageSetup
+      pageSetup: self.pageSetup
     });
 
     ws.getCell('J10').value = 1;
@@ -130,7 +130,7 @@ var self = module.exports = {
       expect(ws.getRow(10).collapsed).to.equal(true);
       expect(ws.properties.outlineLevelCol).to.equal(1);
       expect(ws.properties.outlineLevelRow).to.equal(1);
-      expect(ws.properties.tabColor).to.deep.equal({argb:'FF00FF00'});
+      expect(ws.properties.tabColor).to.deep.equal({argb: 'FF00FF00'});
       expect(ws.properties).to.deep.equal(self.properties);
       expect(ws.pageSetup).to.deep.equal(self.pageSetup);
     }
@@ -154,7 +154,7 @@ var self = module.exports = {
     } else {
       expect(ws.getCell('D1').value).to.equal(self.testValues.formulas[0].result);
       expect(ws.getCell('D1').type).to.equal(Excel.ValueType.Number);
-      expect(ws.getCell('E1').value).to.be.null()
+      expect(ws.getCell('E1').value).to.be.null();
       expect(ws.getCell('E1').type).to.equal(Excel.ValueType.Null);
       expect(ws.getCell('F1').value).to.deep.equal(self.testValues.hyperlink.hyperlink);
       expect(ws.getCell('F1').type).to.equal(Excel.ValueType.String);
@@ -277,15 +277,15 @@ var self = module.exports = {
         expect(ws.getCell('A9').value).to.equal(1);
         expect(ws.getCell('A9').type).to.equal(Excel.ValueType.Number);
 
-        expect(ws.getCell('B9').value).to.deep.equal({ formula:'A9+1', result: 2 });
+        expect(ws.getCell('B9').value).to.deep.equal({ formula: 'A9+1', result: 2 });
         expect(ws.getCell('B9').type).to.equal(Excel.ValueType.Formula);
 
-        ['C9','D9','E9'].forEach((address, index) => {
+        ['C9', 'D9', 'E9'].forEach((address, index) => {
           expect(ws.getCell(address).value).to.deep.equal({ sharedFormula: 'B9', result: index + 3 });
           expect(ws.getCell(address).type).to.equal(Excel.ValueType.Formula);
         });
       } else {
-        ['A9','B9','C9','D9','E9'].forEach((address, index) => {
+        ['A9', 'B9', 'C9', 'D9', 'E9'].forEach((address, index) => {
           expect(ws.getCell(address).value).to.equal(index + 1);
           expect(ws.getCell(address).type).to.equal(Excel.ValueType.Number);
         });
diff --git a/spec/utils/test-workbook-reader.js b/spec/utils/test-workbook-reader.js
index 09a4e5fcc..54f9e92ea 100644
--- a/spec/utils/test-workbook-reader.js
+++ b/spec/utils/test-workbook-reader.js
@@ -66,10 +66,10 @@ module.exports = {
                 expect(row.getCell('B').type).to.equal(Excel.ValueType.Null);
 
                 // C2:D3
-                expect(row.getCell('C').value).to.be.null()
+                expect(row.getCell('C').value).to.be.null();
                 expect(row.getCell('C').type).to.equal(Excel.ValueType.Null);
 
-                expect(row.getCell('D').value).to.be.null()
+                expect(row.getCell('D').value).to.be.null();
                 expect(row.getCell('D').type).to.equal(Excel.ValueType.Null);
 
                 break;
@@ -126,8 +126,7 @@ module.exports = {
               default:
                 break;
             }
-          }
-          catch(error) {
+          } catch (error) {
             reject(error);
           }
         });
@@ -136,8 +135,7 @@ module.exports = {
         try {
           expect(rowCount).to.equal(10);
           resolve();
-        }
-        catch(error) {
+        } catch (error) {
           reject(error);
         }
       });
diff --git a/spec/utils/tools.js b/spec/utils/tools.js
index 43bb71983..08a900b17 100644
--- a/spec/utils/tools.js
+++ b/spec/utils/tools.js
@@ -4,7 +4,7 @@ var _ = require('../../lib/utils/under-dash');
 var MemoryStream = require('memorystream');
 
 var tools = module.exports = {
-  dtMatcher: /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/,
+  dtMatcher: /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[.]\d{3}Z$/,
   fix: function fix(o) {
     // clone the object and replace any date-like strings with new Date()
     var clone;
@@ -25,7 +25,7 @@ var tools = module.exports = {
     return clone;
   },
 
-  concatenateFormula: function () {
+  concatenateFormula: function() {
     var args = Array.prototype.slice.call(arguments);
     var values = args.map(function(value) {
       return '"' + value + '"';
diff --git a/spec/utils/under-dash.js b/spec/utils/under-dash.js
index b7ff8b0e3..433e9da0d 100644
--- a/spec/utils/under-dash.js
+++ b/spec/utils/under-dash.js
@@ -30,7 +30,7 @@ var _ = Object.assign({
     } else {
       return obj;
     }
-    _.each(obj, function (value, name) {
+    _.each(obj, function(value, name) {
       if (value !== undefined) {
         clone[name] = cloneDeep(value, preserveUndefined);
       } else if (preserveUndefined) {
diff --git a/spec/utils/verquire.js b/spec/utils/verquire.js
index e23164b93..9352d0e21 100644
--- a/spec/utils/verquire.js
+++ b/spec/utils/verquire.js
@@ -15,4 +15,4 @@ module.exports = function verquire(path) {
   return useSource ?
     require('../../lib/' + path) : // eslint-disable-line
     require('../../dist/es5/' + path);  // eslint-disable-line
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/test/testSax.js b/test/testSax.js
index 630f5dd9f..849529208 100644
--- a/test/testSax.js
+++ b/test/testSax.js
@@ -32,7 +32,7 @@ e.on('finished', function() {
 
 var zip = unzip.Parse();
 zip.on('entry',function (entry) {
-    if (entry.path.match(/xl\/worksheets\/sheet\d+\.xml/)) {
+    if (entry.path.match(/xl\/worksheets\/sheet\d+[.]xml/)) {
         parseSheet(entry,e);
     }
 });