diff --git a/src/app/Coriolis.jsx b/src/app/Coriolis.jsx
index 2e180587..0e796d23 100644
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -8,7 +8,7 @@ import Header from './components/Header';
 import Tooltip from './components/Tooltip';
 import ModalImport from './components/ModalImport';
 import * as CompanionApiUtils from './utils/CompanionApiUtils';
-import { outfitURL } from './utils/UrlGenerators'
+import { outfitURL } from './utils/UrlGenerators';
 
 import AboutPage from './pages/AboutPage';
 import NotFoundPage from './pages/NotFoundPage';
diff --git a/src/app/components/ComparisonTable.jsx b/src/app/components/ComparisonTable.jsx
index 3f831a3a..f93064d3 100644
--- a/src/app/components/ComparisonTable.jsx
+++ b/src/app/components/ComparisonTable.jsx
@@ -72,7 +72,7 @@ export default class ComparisonTable extends TranslatedComponent {
    * @return {React.Component}    Table row
    */
   _buildRow(build, facets, formats, units) {
-    let url = outfitURL(build.id, build.toString(), build.buildName)
+    let url = outfitURL(build.id, build.toString(), build.buildName);
     let cells = [
       <td key='s' className='tl'><Link href={url}>{build.name}</Link></td>,
       <td key='bn' className='tl'><Link href={url}>{build.buildName}</Link></td>
diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx
index 57f38bbb..6b4b28eb 100644
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -48,22 +48,22 @@ export default class HardpointSlot extends Slot {
       let modTT = translate('modified');
       if (m && m.blueprint) {
         modTT = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
-	if (m.blueprint.special && m.blueprint.special.id) {
+        if (m.blueprint.special && m.blueprint.special.id) {
           modTT += ', ' + translate(m.blueprint.special.name);
-	}
+        }
       }
 
       return <div className='details' draggable='true' onDragStart={drag} onDragEnd={drop}>
         <div className={'cb'}>
           <div className={'l'}>
-	  {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')} onMouseOut={tooltip.bind(null, null)}><MountFixed /></span> : ''}
-	  {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : ''}
-	  {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : ''}
-	  {m.getDamageType() && m.getDamageType().match('K') ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
-	  {m.getDamageType() && m.getDamageType().match('T') ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
-	  {m.getDamageType() && m.getDamageType().match('E') ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
+          {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')} onMouseOut={tooltip.bind(null, null)}><MountFixed /></span> : ''}
+          {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : ''}
+          {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : ''}
+          {m.getDamageType() && m.getDamageType().match('K') ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
+          {m.getDamageType() && m.getDamageType().match('T') ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
+          {m.getDamageType() && m.getDamageType().match('E') ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
           {classRating} {translate(m.name || m.grp)}{ m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }
-	  </div>
+          </div>
 
           <div className={'r'}>{formats.round(m.getMass())}{u.T}</div>
         </div>
diff --git a/src/app/components/Modification.jsx b/src/app/components/Modification.jsx
index b6a6aea0..8c3c6062 100644
--- a/src/app/components/Modification.jsx
+++ b/src/app/components/Modification.jsx
@@ -68,7 +68,7 @@ export default class Modification extends TranslatedComponent {
       return null;
     }
 
-    var symbol;
+    let symbol;
     if (name === 'jitter') {
       symbol = '°';
     } else if (name !== 'burst') {
diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js
index d20a2cf9..a95dc300 100755
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -72,13 +72,13 @@ export default class Module {
       }
       // We store percentages as decimals, so to get them back we need to divide by 10000.  Otherwise
       // we divide by 100.  Both ways we end up with a value with two decimal places
-      var modValue;
+      let modValue;
       if (modification.type === 'percentage') {
-          modValue = this.getModValue(name) / 10000;
+        modValue = this.getModValue(name) / 10000;
       } else if (modification.type === 'numeric') {
-          modValue = this.getModValue(name) / 100;
+        modValue = this.getModValue(name) / 100;
       } else {
-          modValue = this.getModValue(name);
+        modValue = this.getModValue(name);
       }
       if (modValue) {
         if (additive) {
@@ -534,7 +534,7 @@ export default class Module {
     const burstRoF = this.getBurstRoF() || 1;
     const intRoF = this._getModifiedValue('rof');
 
-    return burst / (((burst - 1)/burstRoF) + 1/intRoF);
+    return burst / (((burst - 1) / burstRoF) + 1 / intRoF);
   }
 
   /**
diff --git a/src/app/shipyard/Serializer.js b/src/app/shipyard/Serializer.js
index 6732049c..cd9951a6 100644
--- a/src/app/shipyard/Serializer.js
+++ b/src/app/shipyard/Serializer.js
@@ -8,7 +8,7 @@ import { outfitURL } from '../utils/UrlGenerators';
 
 const STANDARD = ['powerPlant', 'thrusters', 'frameShiftDrive', 'lifeSupport', 'powerDistributor', 'sensors', 'fuelTank'];
 
-const STANDARD_GROUPS = {'powerPlant': 'pp', 'thrusters': 't', 'frameShiftDrive': 'fsd', 'lifeSupport': 'ls', 'powerDistributor': 'pd', 'sensors': 's', 'fuelTank': 'ft'};
+const STANDARD_GROUPS = { 'powerPlant': 'pp', 'thrusters': 't', 'frameShiftDrive': 'fsd', 'lifeSupport': 'ls', 'powerDistributor': 'pd', 'sensors': 's', 'fuelTank': 'ft' };
 
 /**
  * Generates ship-loadout JSON Schema standard object
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 3a1acd16..be771cbc 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -1260,7 +1260,7 @@ export default class Ship {
           let modElements = mods[j].split(':');
           if (modElements[0].match('[0-9]+')) {
             const modification = _.find(Modifications.modifications, function(o) { return o.id === modElements[0]; });
-	    if (modification != null) arr[i][modification.name] = Number(modElements[1]);
+            if (modification != null) arr[i][modification.name] = Number(modElements[1]);
           } else {
             arr[i][modElements[0]] = Number(modElements[1]);
           }
@@ -1297,7 +1297,7 @@ export default class Ship {
       bulkheadBlueprint = this.bulkheads.m.blueprint;
     }
     slots.push(bulkheadMods);
-    blueprints.push(bulkheadBlueprint)
+    blueprints.push(bulkheadBlueprint);
     specials.push(bulkheadBlueprint ? bulkheadBlueprint.special : null);
 
     for (let slot of this.standard) {
@@ -1356,7 +1356,7 @@ export default class Ship {
     for (let special of specials) {
       if (special) {
         // Length is 5 for each special
-	bufsize += 5;
+        bufsize += 5;
       }
     }
 
@@ -1376,20 +1376,20 @@ export default class Ship {
             buffer.writeInt8(MODIFICATION_ID_GRADE, curpos++);
             buffer.writeInt32LE(blueprints[i].grade, curpos);
             curpos += 4;
-	  }
+          }
           if (specials[i]) {
             buffer.writeInt8(MODIFICATION_ID_SPECIAL, curpos++);
             buffer.writeInt32LE(specials[i].id, curpos);
             curpos += 4;
-	  }
+          }
           for (let slotMod of slot) {
             buffer.writeInt8(slotMod.id, curpos++);
-	    if (isNaN(slotMod.value)) {
-                // Need to write the string with exactly four characters, so pad with whitespace
-		buffer.write(("    " + slotMod.value).slice(-4), curpos, 4);
-	    } else {
-                buffer.writeInt32LE(slotMod.value, curpos);
-	    }
+            if (isNaN(slotMod.value)) {
+              // Need to write the string with exactly four characters, so pad with whitespace
+              buffer.write(('    ' + slotMod.value).slice(-4), curpos, 4);
+            } else {
+              buffer.writeInt32LE(slotMod.value, curpos);
+            }
             // const modification = _.find(Modifications.modifications, function(o) { return o.id === slotMod.id; });
             // console.log('ENCODE Slot ' + i + ': ' + modification.name + ' = ' + slotMod.value);
             curpos += 4;
@@ -1414,7 +1414,7 @@ export default class Ship {
    * See updateModificationsString() for details of the structure.
    * @param {String} buffer         Buffer holding modification info
    * @param {Array}  modArr         Modification array
-   * @param {Array}  bluprintArr    Blueprint array
+   * @param {Array}  blueprintArr    Blueprint array
    */
   decodeModificationsStruct(buffer, modArr, blueprintArr) {
     let curpos = 0;
@@ -1428,22 +1428,22 @@ export default class Ship {
         if (modificationId === 40) {
           // Type is special, in that it's a character string
           modificationValue = buffer.toString('utf8', curpos, curpos + 4).trim();
-	} else {
+        } else {
           modificationValue = buffer.readInt32LE(curpos);
-	}
+        }
         curpos += 4;
-	// There are a number of 'special' modification IDs, check for them here
-	if (modificationId === MODIFICATION_ID_BLUEPRINT) {
+        // There are a number of 'special' modification IDs, check for them here
+        if (modificationId === MODIFICATION_ID_BLUEPRINT) {
           blueprint = Object.assign(blueprint, _.find(Modifications.blueprints, function(o) { return o.id === modificationValue; }));
-	} else if (modificationId === MODIFICATION_ID_GRADE) {
+        } else if (modificationId === MODIFICATION_ID_GRADE) {
           blueprint.grade = modificationValue;
-	} else if (modificationId === MODIFICATION_ID_SPECIAL) {
+        } else if (modificationId === MODIFICATION_ID_SPECIAL) {
           blueprint.special = _.find(Modifications.specials, function(o) { return o.id === modificationValue; });
-	} else {
+        } else {
           const modification = _.find(Modifications.modifications, function(o) { return o.id === modificationId; });
           // console.log('DECODE Slot ' + slot + ': ' + modification.name + ' = ' + modificationValue);
           modifications[modification.name] = modificationValue;
-	}
+        }
         modificationId = buffer.readInt8(curpos++);
       }
       modArr[slot] = modifications;
diff --git a/src/app/utils/CompanionApiUtils.js b/src/app/utils/CompanionApiUtils.js
index 91eccc54..6d90bc7f 100644
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -277,14 +277,14 @@ export function shipFromJson(json) {
 function _addModifications(module, modifiers, blueprint, grade) {
   if (!modifiers || !modifiers.modifiers) return;
   
-  var special;
+  let special;
   for (const i in modifiers.modifiers) {
     // Some special modifications
     if (modifiers.modifiers[i].name === 'mod_weapon_clip_size_override') {
       // This is a numeric addition to the clip size, but we need to work it out in terms of being a percentage so
       // that it works the same as other modifications
       const origClip = module.clip || 1;
-      module.setModValue('clip', ((modifiers.modifiers[i].value  - origClip) / origClip ) * 10000);
+      module.setModValue('clip', ((modifiers.modifiers[i].value  - origClip) / origClip) * 10000);
     } else if (modifiers.modifiers[i].name === 'mod_weapon_burst_size') {
       // This is an absolute number that acts as an override
       module.setModValue('burst', modifiers.modifiers[i].value * 100);
@@ -313,7 +313,7 @@ function _addModifications(module, modifiers, blueprint, grade) {
 
     // Note the special if present
     if (modifiers.modifiers[i].name && modifiers.modifiers[i].name.startsWith('special_')) {
-        special = Modifications.specials[modifiers.modifiers[i].name];
+      special = Modifications.specials[modifiers.modifiers[i].name];
     }
   }