diff --git a/admin/client/src/boot/index.js b/admin/client/src/boot/index.js
index a7332285f..c2c805284 100644
--- a/admin/client/src/boot/index.js
+++ b/admin/client/src/boot/index.js
@@ -27,7 +27,7 @@ function appBoot() {
     shouldBatch: true,
     addTypename: true,
     dataIdFromObject: (o) => {
-      if(o.id >= 0 && o.__typename) {
+      if (o.id >= 0 && o.__typename) {
         return `${o.__typename}:${o.id}`;
       }
       return null;
diff --git a/admin/client/src/components/FormBuilder/tests/FormBuilder-test.js b/admin/client/src/components/FormBuilder/tests/FormBuilder-test.js
index bfdde64ab..31c88d416 100644
--- a/admin/client/src/components/FormBuilder/tests/FormBuilder-test.js
+++ b/admin/client/src/components/FormBuilder/tests/FormBuilder-test.js
@@ -34,12 +34,6 @@ describe('FormBuilder', () => {
   };
 
   describe('mergeFieldData()', () => {
-    let formBuilder = null;
-
-    beforeEach(() => {
-      formBuilder = new FormBuilder(baseProps);
-    });
-
     it('should deep merge properties on the originalobject', () => {
       const fieldStructure = {
         component: 'TextField',
diff --git a/admin/client/src/lib/tests/DataFormat-test.js b/admin/client/src/lib/tests/DataFormat-test.js
index e818ca744..72960e6e4 100644
--- a/admin/client/src/lib/tests/DataFormat-test.js
+++ b/admin/client/src/lib/tests/DataFormat-test.js
@@ -10,7 +10,6 @@ import { decodeQuery } from '../DataFormat';
 
 
 describe('DataFormat', () => {
-
   describe('decodeQuery', () => {
     it('should decode flat keys', () => {
       expect(decodeQuery('?foo=1')).toEqual({ foo: '1' });
@@ -19,5 +18,4 @@ describe('DataFormat', () => {
       expect(decodeQuery('?foo[bar]=1')).toEqual({ foo: { bar: '1' } });
     });
   });
-
 });
diff --git a/package.json b/package.json
index 8ae203faa..82f310222 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "lock": "npm-shrinkwrap --dev",
     "test": "NODE_PATH=\"./client/src:./admin/client/src\" jest",
     "coverage": "NODE_PATH=\"./client/src:./admin/client/src\" jest --coverage",
-    "lint": "eslint client/src & eslint admin/client/src & sass-lint -v"
+    "lint": "eslint client/src && eslint admin/client/src && sass-lint -v"
   },
   "repository": {
     "type": "git",