diff --git a/.eslintrc.js b/.eslintrc.js
index 2a2f299..4febcfa 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -43,7 +43,9 @@ module.exports = {
     'no-use-before-define': 'off',
     'no-unused-expressions': 'off',
     'no-nested-ternary': 'off',
-    'no-underscore-dangle': 'off'
+    'no-underscore-dangle': 'off',
+    'consistent-return': 'off',
+    'array-callback-return': 'off'
   },
   env: {
     jest: true,
diff --git a/src/client/client.js b/src/client/client.js
index 32e7263..de5b90a 100644
--- a/src/client/client.js
+++ b/src/client/client.js
@@ -1,7 +1,7 @@
 import 'whatwg-fetch';
 import Eev from 'eev';
 
-"__V_styles__"
+('__V_styles__');
 
 if (!window.HbEventBus) {
   window.HbEventBus = new Eev();
diff --git a/src/index.js b/src/index.js
index 1afd754..d534a79 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,6 +2,6 @@ import withBaseComponent from './universal/partials/withBaseComponent';
 import { SERVICES } from './universal/utils/constants';
 
 export default {
-	withBaseComponent,
-	SERVICES,
-};
\ No newline at end of file
+  withBaseComponent,
+  SERVICES
+};
diff --git a/src/main.js b/src/main.js
index 8a397fb..72af50c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@ if (cluster.isMaster) {
     cluster.fork();
   });
 
-  if (enablePrometheus){
+  if (enablePrometheus) {
     const aggregatorRegistry = new prom.AggregatorRegistry();
     const metricsPort = voltranConfig.port + 1;
 
diff --git a/src/render.js b/src/render.js
index 8a1d9ab..3f1f5ae 100644
--- a/src/render.js
+++ b/src/render.js
@@ -13,8 +13,11 @@ import {
 import Component from './universal/model/Component';
 import logger from './universal/utils/logger';
 
+// eslint-disable-next-line consistent-return
 export default async (req, res) => {
-  const pathParts = xss(req.path).split('/').filter(part => part);
+  const pathParts = xss(req.path)
+    .split('/')
+    .filter(part => part);
   const componentPath = `/${pathParts.join('/')}`;
 
   const routeInfo = matchUrlInRouteConfigs(componentPath);
@@ -26,8 +29,10 @@ export default async (req, res) => {
       path: xss(path),
       query: JSON.parse(xss(JSON.stringify(req.query))),
       cookies: xss(JSON.stringify(req.cookies)),
-      url: xss(req.url).replace(componentPath, '/').replace('//', '/'),
-      userAgent: xss(req.headers['user-agent']),
+      url: xss(req.url)
+        .replace(componentPath, '/')
+        .replace('//', '/'),
+      userAgent: xss(req.headers['user-agent'])
     };
 
     const component = new Component(routeInfo.path);
@@ -62,7 +67,7 @@ export default async (req, res) => {
         .labels(componentName, isWithoutHTML(context.query) ? '1' : '0')
         .observe(Date.now() - res.locals.startEpoch);
     } else {
-      res.html(Preview([fullHtml].join('\n'), [componentName]));
+      res.html(Preview([fullHtml].join('\n')));
     }
   } else {
     res.status(HTTP_STATUS_CODES.NOT_FOUND).json({
diff --git a/src/renderMultiple.js b/src/renderMultiple.js
index cb2861b..433094d 100644
--- a/src/renderMultiple.js
+++ b/src/renderMultiple.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
 import { matchUrlInRouteConfigs } from './universal/core/route/routeUtils';
 import Component from './universal/model/Component';
 import Renderer from './universal/model/Renderer';
@@ -20,7 +21,7 @@ function getRenderer(name, query, cookies, url, path, userAgent) {
       query,
       cookies,
       url: urlWithPath,
-      userAgent,
+      userAgent
     };
 
     if (Component.isExist(componentPath)) {
@@ -173,7 +174,6 @@ async function getResponses(renderers) {
 async function getPreview(responses, requestCount) {
   return Preview(
     [...Object.keys(responses).map(name => responses[name].fullHtml)].join('\n'),
-    Object.keys(responses),
     `${requestCount} request!`
   );
 }
@@ -183,7 +183,16 @@ export default async (req, res) => {
   const renderers = req.params.components
     .split(',')
     .filter((value, index, self) => self.indexOf(value) === index)
-    .map(name => getRenderer(name, req.query, req.cookies, req.url, `/${req.params.path || ''}`, req.headers['user-agent']))
+    .map(name =>
+      getRenderer(
+        name,
+        req.query,
+        req.cookies,
+        req.url,
+        `/${req.params.path || ''}`,
+        req.headers['user-agent']
+      )
+    )
     .filter(renderer => renderer != null);
 
   if (!renderers.length) {
diff --git a/src/server.js b/src/server.js
index debed5a..1381210 100644
--- a/src/server.js
+++ b/src/server.js
@@ -18,7 +18,7 @@ import render from './render';
 import registerControllers from './api/controllers';
 import renderMultiple from './renderMultiple';
 
- import { HTTP_STATUS_CODES } from './universal/utils/constants';
+import { HTTP_STATUS_CODES } from './universal/utils/constants';
 
 import voltranConfig from '../voltran.config';
 
@@ -26,10 +26,11 @@ const enablePrometheus = voltranConfig.monitoring.prometheus;
 let Prometheus;
 
 if (enablePrometheus) {
-  Prometheus = require("__V_PROMETHEUS__");
+  // eslint-disable-next-line global-require
+  Prometheus = require('__V_PROMETHEUS__');
 }
 
-const fragmentManifest = require("__V_DICTIONARY__");
+const fragmentManifest = require('__V_DICTIONARY__');
 
 process.on('unhandledRejection', (reason, p) => {
   console.error('Unhandled Rejection at:', p, 'reason:', reason);
@@ -115,10 +116,7 @@ if (process.env.NODE_ENV === 'production') {
   hiddie.use(locals);
   hiddie.use(helmet());
   hiddie.use(cors);
-  hiddie.use(
-    '/',
-    serveStatic(voltranConfig.distFolder + '/public')
-  );
+  hiddie.use('/', serveStatic(`${voltranConfig.distFolder}/public`));
   hiddie.use(cookieParser());
   hiddie.use(utils);
   hiddie.use(handleUrls);
@@ -140,7 +138,7 @@ export default () => {
     compression(),
     locals,
     helmet(),
-    serveStatic(voltranConfig.distFolder + '/public'),
+    serveStatic(`${voltranConfig.distFolder}/public`),
     cookieParser(),
     utils,
     handleUrls,
diff --git a/src/tools/run.js b/src/tools/run.js
index c783bf2..4f17128 100644
--- a/src/tools/run.js
+++ b/src/tools/run.js
@@ -5,14 +5,18 @@ function run(fn, options) {
   const start = new Date();
 
   console.log(
-    'src/tools/run.js', 'run', `Starting '${task.name}${options ? ` (${options})` : ''}'...`
+    'src/tools/run.js',
+    'run',
+    `Starting '${task.name}${options ? ` (${options})` : ''}'...`
   );
 
   return task(options).then(resolution => {
     const end = new Date();
     const time = end.getTime() - start.getTime();
     console.log(
-      'src/tools/run.js', 'run', `Finished '${task.name}${options ? ` (${options})` : ''}' after ${time} ms`
+      'src/tools/run.js',
+      'run',
+      `Finished '${task.name}${options ? ` (${options})` : ''}' after ${time} ms`
     );
     return resolution;
   });
diff --git a/src/tools/start.js b/src/tools/start.js
index 5b2a284..a224765 100644
--- a/src/tools/start.js
+++ b/src/tools/start.js
@@ -36,10 +36,12 @@ async function start() {
   );
 
   hiddie.use(webpackHotMiddleware(clientCompiler));
-  hiddie.use(webpackHotServerMiddleware(compiler, {
-    chunkName: 'server',
-    serverRendererOptions: { hiddie }
-  }));
+  hiddie.use(
+    webpackHotServerMiddleware(compiler, {
+      chunkName: 'server',
+      serverRendererOptions: { hiddie }
+    })
+  );
 
   http.createServer(hiddie.run).listen(voltranConfig.port);
 
diff --git a/src/universal/common/network/apiUtils.js b/src/universal/common/network/apiUtils.js
index 08cc707..d83a266 100644
--- a/src/universal/common/network/apiUtils.js
+++ b/src/universal/common/network/apiUtils.js
@@ -1,5 +1,5 @@
 import Request from '../../model/Request';
-import {createCacheManagerInstance} from '../../core/cache/cacheUtils';
+import { createCacheManagerInstance } from '../../core/cache/cacheUtils';
 
 function createApiClient(apiManager) {
   const cacheManager = createCacheManagerInstance();
@@ -23,9 +23,9 @@ function createApiClient(apiManager) {
   function getPayload(url, method, params, configArgument) {
     let payload;
     if (configArgument) {
-      payload = {url, method, params, ...configArgument};
+      payload = { url, method, params, ...configArgument };
     } else {
-      payload = {url, method, params};
+      payload = { url, method, params };
     }
     return payload;
   }
@@ -48,7 +48,7 @@ function createApiClient(apiManager) {
       if (cacheResponse && !cacheResponse.isExpired) {
         // console.log('Came from cache', cacheSettings.cacheKey);
         request = getRequest(method, url, paramsArgument, configArgument, {
-          cacheResponse: cacheResponse.cacheValue,
+          cacheResponse: cacheResponse.cacheValue
         });
       } else {
         // console.log('Not exist cache, request sent', cacheSettings.cacheKey);
@@ -97,9 +97,9 @@ function createApiClient(apiManager) {
 
     options(url, config, cacheSettings) {
       return makeRequest('options', url, config, null, cacheSettings);
-    },
+    }
   };
 }
 
 // eslint-disable-next-line import/prefer-default-export
-export {createApiClient};
+export { createApiClient };
diff --git a/src/universal/components/Html.js b/src/universal/components/Html.js
index d20fc00..61cf88e 100644
--- a/src/universal/components/Html.js
+++ b/src/universal/components/Html.js
@@ -22,7 +22,15 @@ function componentClassName(componentName, context) {
   return context.query && context.query.id ? `${componentName}_${context.query.id}` : componentName;
 }
 
-function Html({ componentName, children, styleTags, initialState, fullWidth, isMobileFragment, context }) {
+function Html({
+  componentName,
+  children,
+  styleTags,
+  initialState,
+  fullWidth,
+  isMobileFragment,
+  context
+}) {
   return `
     <div>
       ${styleTags}
@@ -30,7 +38,9 @@ function Html({ componentName, children, styleTags, initialState, fullWidth, isM
       <div
         id='${componentName.replace(/['"']+/g, '')}_${initialState.id}'
         style="pointer-events: none;"
-        class="${voltranConfig.prefix}-voltran-body voltran-body ${isMobileFragment ? 'mobile' : ''}${fullWidth ? 'full' : ''} ${componentClassName(componentName, context)}">
+        class="${voltranConfig.prefix}-voltran-body voltran-body ${
+    isMobileFragment ? 'mobile' : ''
+  }${fullWidth ? 'full' : ''} ${componentClassName(componentName, context)}">
         ${children}
       </div>
       <div>REPLACE_WITH_LINKS</div>
diff --git a/src/universal/components/Preview.js b/src/universal/components/Preview.js
index 0d08236..87e7f17 100644
--- a/src/universal/components/Preview.js
+++ b/src/universal/components/Preview.js
@@ -1,6 +1,6 @@
 const appConfig = require('__APP_CONFIG__');
 
-export default (body, componentNames = [], title = null) => {
+export default (body, title = null) => {
   const additionalTitle = title ? ` - ${title}` : '';
 
   function cr(condition, ok, cancel) {
@@ -14,7 +14,8 @@ export default (body, componentNames = [], title = null) => {
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <script>window.HBUS_LAZY = true;</script>
         <script src="${appConfig.voltranCommonUrl}"></script>
-        ${cr(appConfig.showPreviewFrame,
+        ${cr(
+          appConfig.showPreviewFrame,
           `<style>
             .voltran-body {
               color: #484848;
diff --git a/src/universal/components/PureHtml.js b/src/universal/components/PureHtml.js
index 7eab341..b2a13a8 100644
--- a/src/universal/components/PureHtml.js
+++ b/src/universal/components/PureHtml.js
@@ -9,7 +9,10 @@ function generateInitialState(initialState, componentName) {
     ${include} = {
       ...(${include} || {}),
       '${initialState.id}': {
-        'STATE': ${JSON.stringify(initialState).replace(new RegExp('</script>', 'g'), '<\\/script>')}
+        'STATE': ${JSON.stringify(initialState).replace(
+          new RegExp('</script>', 'g'),
+          '<\\/script>'
+        )}
       }
     }`;
 }
@@ -32,7 +35,9 @@ export default (resultPath, componentName, initialState) => {
   return `
     <div>
       <script type="text/javascript">${generateInitialState(initialState, componentName)}</script>
-      <div id='${componentName.replace(/['"']+/g, '')}_${initialState.id}' style="pointer-events: none;"></div>
+      <div id='${componentName.replace(/['"']+/g, '')}_${
+    initialState.id
+  }' style="pointer-events: none;"></div>
       <div>REPLACE_WITH_LINKS</div>
       <div>REPLACE_WITH_SCRIPTS</div>
     </div>
diff --git a/src/universal/core/api/ClientApiManagerCache.js b/src/universal/core/api/ClientApiManagerCache.js
index 95dbbdb..56ad45b 100644
--- a/src/universal/core/api/ClientApiManagerCache.js
+++ b/src/universal/core/api/ClientApiManagerCache.js
@@ -1,8 +1,9 @@
 /* istanbul ignore file */
-const { services, timeouts } = require('__APP_CONFIG__');
 import ClientApiManager from './ClientApiManager';
 import { SERVICES } from '../../utils/constants';
 
+const { services, timeouts } = require('__APP_CONFIG__');
+
 const cache = {};
 
 Object.entries(services).forEach(entity => {
diff --git a/src/universal/core/api/ServerApiManagerCache.js b/src/universal/core/api/ServerApiManagerCache.js
index 4f33a4c..b0e77a9 100644
--- a/src/universal/core/api/ServerApiManagerCache.js
+++ b/src/universal/core/api/ServerApiManagerCache.js
@@ -1,8 +1,9 @@
 /* istanbul ignore file */
-const { services, timeouts } = require('__APP_CONFIG__');
 import ServerApiManager from './ServerApiManager';
 import { SERVICES } from '../../utils/constants';
 
+const { services, timeouts } = require('__APP_CONFIG__');
+
 const cache = {};
 
 Object.entries(services).forEach(entity => {
diff --git a/src/universal/core/cache/cacheManager.js b/src/universal/core/cache/cacheManager.js
index 048df2d..370c38a 100644
--- a/src/universal/core/cache/cacheManager.js
+++ b/src/universal/core/cache/cacheManager.js
@@ -8,40 +8,30 @@ class CacheManager {
   }
 
   get(options) {
-    const {
-      cacheKey,
-      expireTime,
-    } = options;
+    const { cacheKey, expireTime } = options;
 
     const cache = this.store.get(cacheKey);
     if (!cache) {
       return null;
     }
 
-    const {
-      createdDate,
-      cacheValue,
-    } = cache;
+    const { createdDate, cacheValue } = cache;
     const cacheCreatedDate = cache && new Date(createdDate);
-    const cacheExpireDate = new Date(
-      new Date() - (expireTime || DEFAULT_EXPIRE_TIME),
-    );
+    const cacheExpireDate = new Date(new Date() - (expireTime || DEFAULT_EXPIRE_TIME));
 
     return {
       createdDate,
       cacheValue,
-      isExpired: cacheExpireDate > cacheCreatedDate,
+      isExpired: cacheExpireDate > cacheCreatedDate
     };
   }
 
   put(options, val) {
-    const {
-      cacheKey,
-    } = options;
+    const { cacheKey } = options;
 
     this.store.set(cacheKey, {
       createdDate: new Date(),
-      cacheValue: val,
+      cacheValue: val
     });
   }
 
@@ -54,7 +44,7 @@ class CacheManager {
   }
 
   delete() {
-    //no op here because this is standalone, not a part of $cacheFactory
+    // no op here because this is standalone, not a part of $cacheFactory
   }
 }
 
diff --git a/src/universal/core/cache/cacheUtils.js b/src/universal/core/cache/cacheUtils.js
index ba09c0b..fc8481a 100644
--- a/src/universal/core/cache/cacheUtils.js
+++ b/src/universal/core/cache/cacheUtils.js
@@ -9,6 +9,5 @@ function createCacheManagerInstance() {
   return cacheManagerInstance;
 }
 
-export {
-  createCacheManagerInstance,
-}
+// eslint-disable-next-line import/prefer-default-export
+export { createCacheManagerInstance };
diff --git a/src/universal/core/route/routesWithComponents.js b/src/universal/core/route/routesWithComponents.js
index b94485b..c70e910 100644
--- a/src/universal/core/route/routesWithComponents.js
+++ b/src/universal/core/route/routesWithComponents.js
@@ -1,5 +1,3 @@
-import withBaseComponent from '../../partials/withBaseComponent';
-
 const components = require('__V_COMPONENTS__');
 
 const routesWithComponents = {};
diff --git a/src/universal/model/Component.js b/src/universal/model/Component.js
index 2df4920..e9a2616 100644
--- a/src/universal/model/Component.js
+++ b/src/universal/model/Component.js
@@ -4,13 +4,19 @@ import { createComponentName } from '../utils/helper';
 const COMPONENTS = require('__V_COMPONENTS__').default;
 
 export default class Component {
-  static getComponentName = (path) => { return createComponentName(path) };
+  static getComponentName = path => {
+    return createComponentName(path);
+  };
 
   static getComponentPath = name => `/${name}`;
 
-  static getComponentIsMobileFragment = (path) => { return COMPONENTS[path].isMobileFragment ? COMPONENTS[path].isMobileFragment : false };
+  static getComponentIsMobileFragment = path => {
+    return COMPONENTS[path].isMobileFragment ? COMPONENTS[path].isMobileFragment : false;
+  };
 
-  static getComponentIsFullWidth = (path) => { return COMPONENTS[path].fullWidth ? COMPONENTS[path].fullWidth : false };
+  static getComponentIsFullWidth = path => {
+    return COMPONENTS[path].fullWidth ? COMPONENTS[path].fullWidth : false;
+  };
 
   static getComponentObjectWithPath = path => routesWithComponents[path];
 
diff --git a/src/universal/model/Request.js b/src/universal/model/Request.js
index 6363f0d..e24771e 100644
--- a/src/universal/model/Request.js
+++ b/src/universal/model/Request.js
@@ -12,18 +12,21 @@ export default class Request {
     if (this.response?.cacheResponse) {
       promise = Promise.resolve(this.response.cacheResponse);
     } else {
-      promise = this.client.request(this.payload).then(response => {
-        if (this.response?.onSuccess) {
-          return this.response.onSuccess(response);
-        }
-        return response;
-      }).catch(error => {
-        if (this.response?.onError) {
-          return this.response.onError(error);
-        }
-        return error;
-      });
+      promise = this.client
+        .request(this.payload)
+        .then(response => {
+          if (this.response?.onSuccess) {
+            return this.response.onSuccess(response);
+          }
+          return response;
+        })
+        .catch(error => {
+          if (this.response?.onError) {
+            return this.response.onError(error);
+          }
+          return error;
+        });
     }
-    return promise
+    return promise;
   }
 }
diff --git a/src/universal/partials/withBaseComponent.js b/src/universal/partials/withBaseComponent.js
index 2a9154b..0f78d45 100644
--- a/src/universal/partials/withBaseComponent.js
+++ b/src/universal/partials/withBaseComponent.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import queryString from 'query-string';
 
 import ClientApp from '../components/ClientApp';
 import { WINDOW_GLOBAL_PARAMS } from '../utils/constants';
@@ -11,7 +10,7 @@ const getStaticProps = () => {
   const staticProps = {};
 
   if (voltranConfig.staticProps) {
-    voltranConfig.staticProps.map((property) => {
+    voltranConfig.staticProps.map(property => {
       staticProps[property.name] = property.value;
     });
   }
@@ -19,12 +18,6 @@ const getStaticProps = () => {
   return staticProps;
 };
 
-const getComponentId = (location) => {
-  const params = queryString.parse(location.search);
-
-  return params ? params.id : false;
-};
-
 const withBaseComponent = (PageComponent, pathName) => {
   const componentName = createComponentName(pathName);
   const prefix = voltranConfig.prefix.toUpperCase();
@@ -44,10 +37,7 @@ const withBaseComponent = (PageComponent, pathName) => {
 
       ReactDOM.hydrate(
         <ClientApp>
-          <PageComponent
-            {...staticProps}
-            initialState={initialState}
-            history={history}/>
+          <PageComponent {...staticProps} initialState={initialState} history={history} />
         </ClientApp>,
         componentEl,
         () => {
diff --git a/src/universal/service/RenderService.js b/src/universal/service/RenderService.js
index fa0ebb7..7e3ab31 100644
--- a/src/universal/service/RenderService.js
+++ b/src/universal/service/RenderService.js
@@ -49,7 +49,7 @@ const renderHtml = (component, initialState, context) => {
   const children = ReactDOMServer.renderToString(
     sheet.collectStyles(
       <StaticRouter location={component.path} context={context}>
-        <ConnectedApp initialState={initialStateWithLocation} location={context}/>
+        <ConnectedApp initialState={initialStateWithLocation} location={context} />
       </StaticRouter>
     )
   );
@@ -65,7 +65,7 @@ const renderHtml = (component, initialState, context) => {
     initialState: initialStateWithLocation,
     fullWidth: component.fullWidth,
     isMobileFragment: component.isMobileFragment,
-    context,
+    context
   });
 };
 
@@ -84,7 +84,10 @@ const renderComponent = async (component, context, predefinedInitialState = null
     predefinedInitialState
   );
 
-  const { links, scripts, activeComponent } = await createBaseRenderHtmlProps(component.name, subComponentFiles);
+  const { links, scripts, activeComponent } = await createBaseRenderHtmlProps(
+    component.name,
+    subComponentFiles
+  );
 
   const output = renderHtml(component, initialState, context);
   const fullHtml = renderLinksAndScripts(output, generateLinks(links), generateScripts(scripts));
@@ -98,7 +101,7 @@ const renderComponent = async (component, context, predefinedInitialState = null
     componentName: component.name,
     seoState,
     fullWidth: component.fullWidth,
-    isMobileComponent: component.isMobileComponent,
+    isMobileComponent: component.isMobileComponent
   };
 };
 
diff --git a/src/universal/tools/newrelic/newrelic.js b/src/universal/tools/newrelic/newrelic.js
index 7d62054..c4d8a79 100644
--- a/src/universal/tools/newrelic/newrelic.js
+++ b/src/universal/tools/newrelic/newrelic.js
@@ -1,8 +1,10 @@
-const {newrelicEnabled} = require('__APP_CONFIG__');
+const { newrelicEnabled } = require('__APP_CONFIG__');
 
+// eslint-disable-next-line import/no-mutable-exports
 let newrelic = null;
 
 if (newrelicEnabled) {
+  // eslint-disable-next-line global-require
   newrelic = require('newrelic');
 }
 
diff --git a/src/universal/utils/baseRenderHtml.js b/src/universal/utils/baseRenderHtml.js
index abf2d6d..a0ef08f 100644
--- a/src/universal/utils/baseRenderHtml.js
+++ b/src/universal/utils/baseRenderHtml.js
@@ -18,7 +18,10 @@ if (process.env.NODE_ENV === 'production') {
   Object.keys(assets).forEach(name => {
     if (assets[name].css) {
       cssContentCache[name] = fs.readFileSync(
-        path.resolve(process.cwd(), `${voltranConfig.publicDistFolder}/${cleanAssetsPrefixFromAssetURI(assets[name].css)}`),
+        path.resolve(
+          process.cwd(),
+          `${voltranConfig.publicDistFolder}/${cleanAssetsPrefixFromAssetURI(assets[name].css)}`
+        ),
         'utf8'
       );
     }
@@ -37,9 +40,10 @@ const getScripts = (name, subComponentFiles) => {
       isAsync: false
     }
   ];
-  const mergedScripts = subComponentFilesScripts && subComponentFilesScripts.length > 0 ?
-    scripts.concat(subComponentFiles.scripts) :
-    scripts;
+  const mergedScripts =
+    subComponentFilesScripts && subComponentFilesScripts.length > 0
+      ? scripts.concat(subComponentFiles.scripts)
+      : scripts;
 
   return mergedScripts;
 };
@@ -53,7 +57,9 @@ const getStyles = async (name, subComponentFiles) => {
       rel: 'stylesheet',
       href: `${assetsBaseUrl}${assets[name].css}`,
       criticalStyleComponent:
-        process.env.NODE_ENV === 'production' && !voltranConfig.criticalCssDisabled ? cssContentCache[name] : undefined
+        process.env.NODE_ENV === 'production' && !voltranConfig.criticalCssDisabled
+          ? cssContentCache[name]
+          : undefined
     });
   }
 
@@ -62,13 +68,16 @@ const getStyles = async (name, subComponentFiles) => {
       rel: 'stylesheet',
       href: `${assetsBaseUrl}${assets.client.css}`,
       criticalStyleComponent:
-        process.env.NODE_ENV === 'production' && !voltranConfig.criticalCssDisabled ? cssContentCache.client : undefined
+        process.env.NODE_ENV === 'production' && !voltranConfig.criticalCssDisabled
+          ? cssContentCache.client
+          : undefined
     });
   }
 
-  const mergedLinks = subComponentFilesStyles && subComponentFilesStyles.length > 0 ?
-    links.concat(subComponentFiles.styles) :
-    links;
+  const mergedLinks =
+    subComponentFilesStyles && subComponentFilesStyles.length > 0
+      ? links.concat(subComponentFiles.styles)
+      : links;
 
   return mergedLinks;
 };
diff --git a/src/universal/utils/constants.js b/src/universal/utils/constants.js
index 212a919..909bda4 100644
--- a/src/universal/utils/constants.js
+++ b/src/universal/utils/constants.js
@@ -31,5 +31,5 @@ export {
   JSON_CONTENT_TYPE,
   CONTENT_TYPE_HEADER,
   REQUEST_TYPES_WITH_BODY,
-  SERVICES,
+  SERVICES
 };
diff --git a/src/universal/utils/helper.js b/src/universal/utils/helper.js
index 3ead627..799edaa 100644
--- a/src/universal/utils/helper.js
+++ b/src/universal/utils/helper.js
@@ -6,7 +6,7 @@ export const removeQueryStringFromUrl = url => {
 };
 
 export const createComponentName = routePath => {
-	return routePath.split('/').join('');
+  return routePath.split('/').join('');
 };
 
 export function guid() {
@@ -14,5 +14,7 @@ export function guid() {
 }
 
 export function s4() {
-  return Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1);
+  return Math.floor((1 + Math.random()) * 0x10000)
+    .toString(16)
+    .substring(1);
 }
diff --git a/src/universal/utils/logger.js b/src/universal/utils/logger.js
index 6a9eef8..06b36ef 100644
--- a/src/universal/utils/logger.js
+++ b/src/universal/utils/logger.js
@@ -36,7 +36,7 @@ const logger = {
     }
 
     console.error(this.formatter('ERROR', message, requestPath));
-  },
+  }
 };
 
 export default logger;