diff --git a/Dockerfile b/Dockerfile
index c81df4725bc23b15b02ed7c1f9e0ba3f69d2ce7e..5d4f728c1ce795c741863712d51307d83f2f3218 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:10-alpine
 
 # Create app directory
-WORKDIR /usr/src/app
+WORKDIR /var/www/todoapp
 
 # Bundle app source
 COPY . .
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8a678eae386d5b1686ed125a356995dbf17beb10..a72caf4bd97046a9e09335698eec9189e030b78a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -13,8 +13,6 @@ services:
     environment:
       - NODE_ENV=development
       - PORT=3000
-    command: 
-      sh -c 'npm i && node server.js'
   
   mongo:
     image: mongo
diff --git a/routes/front.js b/routes/front.js
index 9941b9857c74439d2f1e7888395f79364478da90..1971a6f9c494278e1eb06f8e03f2fb84383e07bf 100644
--- a/routes/front.js
+++ b/routes/front.js
@@ -8,16 +8,9 @@ router.get('/', (req, res) => {
 
     Todo.find({}, (err, todos) => {
 
-        if(Object.keys(todos).length > 0) {
-            res.render("todos", {
-                tasks: todos
-            });
-        }
-        else {
-            res.render("todos", {
-                tasks: {}
-            });
-        }
+        res.render("todos", {
+            tasks: (Object.keys(todos).length > 0 ? todos : {})
+        });
     });
 });
 
diff --git a/server.js b/server.js
index 2cdbfe431c9fd33e9b0fb9d536e59b3500b5d33b..e067d1951b54c9158c4b07deec4b24b3a6e14218 100644
--- a/server.js
+++ b/server.js
@@ -3,26 +3,26 @@ const bodyParse = require('body-parser');
 const app = require('express')();
 const moment = require('moment');
 
+// Fontend route
 const FrontRouter = require('./routes/front');
-app.locals.moment = moment;
 
+// Set ejs template engine
 app.set('view engine', 'ejs');
-app.use(bodyParse.urlencoded({extended: false}));
 
+app.use(bodyParse.urlencoded({extended: false}));
+app.locals.moment = moment;
 
+// Database connection
 const db = require('./config/keys').mongoProdURI;
 mongoose
 .connect(db, {useNewUrlParser: true})
-.then(() => {
-    console.log(`Mongodb Connected`);
-})
-.catch((error) => {
-    console.log(error);
-});
+.then(() => console.log(`Mongodb Connected`))
+.catch(error => console.log(error));
 
 
 app.use(FrontRouter);
 
+
 const PORT = process.env.PORT || 3000;
 app.listen(PORT, () => {
     console.log(`Server listening on port ${PORT}`);
diff --git a/views/todos.ejs b/views/todos.ejs
index 0cee400c759db39ffedc4142c341a12718240bb6..49eb9aab3592d7ef73042424d39914518d1cc859 100644
--- a/views/todos.ejs
+++ b/views/todos.ejs
@@ -52,7 +52,7 @@
                             </ul>
                             <% } else { %>
                             <div class="text-center"><strong>Please add some task.</strong></div>
-                            <% }%>
+                            <% } %>
                         </div>
                     </div>
                 </div>