diff --git a/app/server/app.js b/app/server/app.js
index 035a411..1a24f31 100644
--- a/app/server/app.js
+++ b/app/server/app.js
@@ -4,6 +4,7 @@
 // app.js
 
 // eslint-disable-next-line import/order
+const config = require('./config');
 const path = require('path');
 
 const nodeRoot = path.dirname(require.main.filename);
@@ -22,39 +23,35 @@ const staticFileConfig = {
   },
 };
 
-const app = express();
-const server = require('http').createServer(app);
-const io = require('socket.io')(server, {
-  transports: ['websocket'],
-  serveClient: false,
-  path: '/ssh/socket.io',
-  origins: ['localhost:2224'],
-  cors: { origin: '*' },
-});
+function startServer() {
+  const app = express();
+  const server = require('http').createServer(app);
+  const io = require('socket.io')(server, {
+    transports: ['websocket'],
+    serveClient: false,
+    path: '/ssh/socket.io',
+    origins: ['localhost:2224'],
+    cors: { origin: '*' },
+  });
 
-const appSocket = require('./socket');
-const { connectRoute: connect } = require('./routes');
+  const appSocket = require('./socket');
+  const { connectRoute: connect } = require('./routes');
 
-app.disable('x-powered-by');
-app.use(express.urlencoded({ extended: true }));
-app.post('/ssh/host/:host?', connect);
-// To remove
-// Static files..
-app.post('/ssh', express.static(publicPath, staticFileConfig));
-app.use('/ssh', express.static(publicPath, staticFileConfig));
-///
-app.get('/ssh/host/:host?', connect);
+  app.disable('x-powered-by');
+  app.use(express.urlencoded({ extended: true }));
+  app.post('/ssh/host/:host?', connect);
+  // ======== To remove ========
+  // Static files..
+  app.post('/ssh', express.static(publicPath, staticFileConfig));
+  app.use('/ssh', express.static(publicPath, staticFileConfig));
+  // ===========================
+  app.get('/ssh/host/:host?', connect);
 
-io.on('connection', appSocket);
+  io.on('connection', appSocket);
+}
+
+startServer();
 
-// // clean stop
-// function stopApp(reason) {
-//   shutdownMode = false;
-//   if (reason) console.info(`Stopping: ${reason}`);
-//   clearInterval(shutdownInterval);
-//   io.close();
-//   server.close();
-// }
 module.exports = { server, config };
 
 // const onConnection = (socket) => {