diff --git a/client/config/env.js b/client/config/env.js
index 211711b..112e360 100644
--- a/client/config/env.js
+++ b/client/config/env.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 const fs = require('fs');
 const path = require('path');
diff --git a/client/config/jest/cssTransform.js b/client/config/jest/cssTransform.js
index 8f65114..d5a7f7f 100644
--- a/client/config/jest/cssTransform.js
+++ b/client/config/jest/cssTransform.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 // This is a custom Jest transformer turning style imports into empty objects.
 // http://facebook.github.io/jest/docs/en/webpack.html
diff --git a/client/config/jest/fileTransform.js b/client/config/jest/fileTransform.js
index aab6761..a71e0d4 100644
--- a/client/config/jest/fileTransform.js
+++ b/client/config/jest/fileTransform.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 const path = require('path');
 const camelcase = require('camelcase');
diff --git a/client/config/modules.js b/client/config/modules.js
index c84210a..1293bca 100644
--- a/client/config/modules.js
+++ b/client/config/modules.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 const fs = require('fs');
 const path = require('path');
diff --git a/client/config/paths.js b/client/config/paths.js
index 68cde7b..ceac91f 100644
--- a/client/config/paths.js
+++ b/client/config/paths.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 const path = require('path');
 const fs = require('fs');
diff --git a/client/config/pnpTs.js b/client/config/pnpTs.js
index d1b0539..c5c0092 100644
--- a/client/config/pnpTs.js
+++ b/client/config/pnpTs.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 const { resolveModuleName } = require('ts-pnp');
 
diff --git a/client/config/webpack.config.js b/client/config/webpack.config.js
index c33f195..3999324 100644
--- a/client/config/webpack.config.js
+++ b/client/config/webpack.config.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 const fs = require('fs');
 const isWsl = require('is-wsl');
diff --git a/client/config/webpackDevServer.config.js b/client/config/webpackDevServer.config.js
index 240881e..346d212 100644
--- a/client/config/webpackDevServer.config.js
+++ b/client/config/webpackDevServer.config.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
 const evalSourceMapMiddleware = require('react-dev-utils/evalSourceMapMiddleware');
diff --git a/client/package.json b/client/package.json
index d84e9e9..3c08ed9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -78,6 +78,8 @@
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
     "test": "node scripts/test.js",
+    "lint": "eslint . --ext .js,.ts",
+    "lint-fix": "eslint . --ext .js,.ts --fix",
     "generate": "plop"
   },
   "eslintConfig": {
diff --git a/client/scripts/build.js b/client/scripts/build.js
index 58c5447..2392ae4 100644
--- a/client/scripts/build.js
+++ b/client/scripts/build.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'production';
diff --git a/client/scripts/start.js b/client/scripts/start.js
index dd89084..3478c15 100644
--- a/client/scripts/start.js
+++ b/client/scripts/start.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'development';
diff --git a/client/scripts/test.js b/client/scripts/test.js
index b57cb38..8face8b 100644
--- a/client/scripts/test.js
+++ b/client/scripts/test.js
@@ -1,4 +1,4 @@
-'use strict';
+
 
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'test';
diff --git a/client/src/app/components/molecules/PrincipalContent/ImageContainer/Image/Image.js b/client/src/app/components/molecules/PrincipalContent/ImageContainer/Image/Image.js
index 653460f..00344a6 100644
--- a/client/src/app/components/molecules/PrincipalContent/ImageContainer/Image/Image.js
+++ b/client/src/app/components/molecules/PrincipalContent/ImageContainer/Image/Image.js
@@ -34,7 +34,7 @@ const Image = props => {
       const img = base64Flag + imageStr
       image.img.imageUrl = img
       setImg(img)
-  })
+  }, [image.img.data.data, image.img.imageUrl])
 
   const arrayBufferToBase64 = (buffer) => {
     var binary = '';
diff --git a/client/src/app/components/molecules/PrincipalContent/ImageContainer/ImageContainer.js b/client/src/app/components/molecules/PrincipalContent/ImageContainer/ImageContainer.js
index 3bc68cf..a8c017c 100644
--- a/client/src/app/components/molecules/PrincipalContent/ImageContainer/ImageContainer.js
+++ b/client/src/app/components/molecules/PrincipalContent/ImageContainer/ImageContainer.js
@@ -4,7 +4,7 @@ import {connect} from 'react-redux'
 import {createPropsSelector} from 'reselect-immutable-helpers'
 import {getImages} from './../../../../pages/Home/selectors'
 import ImageCard from './Image'
-import Image from './../../../../models/image.model'
+// import Image from './../../../../models/image.model'
 
 class ImageContainer extends React.Component {
 
diff --git a/client/src/app/components/molecules/ecstatica/creator/MoodCard/MoodCard.js b/client/src/app/components/molecules/ecstatica/creator/MoodCard/MoodCard.js
index 568454b..92e59ae 100644
--- a/client/src/app/components/molecules/ecstatica/creator/MoodCard/MoodCard.js
+++ b/client/src/app/components/molecules/ecstatica/creator/MoodCard/MoodCard.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import MoodSelector from '../MoodSelector/MoodSelector';
+// import MoodSelector from '../MoodSelector/MoodSelector';
 
 const MoodCard = ({mood}) => {
   return (
diff --git a/client/src/app/components/molecules/ecstatica/creator/MoodSelector/MoodSelector.js b/client/src/app/components/molecules/ecstatica/creator/MoodSelector/MoodSelector.js
index 0ee7e90..4ea84cc 100644
--- a/client/src/app/components/molecules/ecstatica/creator/MoodSelector/MoodSelector.js
+++ b/client/src/app/components/molecules/ecstatica/creator/MoodSelector/MoodSelector.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import MoodCard from '../MoodCard/MoodCard';
 
 const MoodSelector = props => {
diff --git a/client/src/app/services/data.service.ts b/client/src/app/services/data.service.ts
index 87719a2..4c53931 100644
--- a/client/src/app/services/data.service.ts
+++ b/client/src/app/services/data.service.ts
@@ -1,7 +1,5 @@
 export default class DataService {
 
-  constructor() { }
-
   getFeaturedImages() {
     return fetch('/images/nature')
     .then(res => {