diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae2d866
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/*
+data/*
\ No newline at end of file
diff --git a/app.js b/app.js
index c2d169e..55eafd2 100644
--- a/app.js
+++ b/app.js
@@ -1,17 +1,16 @@
-var express = require('express');
-var path = require('path');
-var favicon = require('static-favicon');
-var logger = require('morgan');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
+const express = require('express');
+const path = require('path');
+const favicon = require('static-favicon');
+const logger = require('morgan');
+const cookieParser = require('cookie-parser');
+const bodyParser = require('body-parser');
 //Database
-var mongo = require('mongoskin');
-var db = mongo.db("mongodb://localhost:27017/nodetest2", {native_parser:true});
+const mongo = require('mongoskin');
+const db = mongo.db("mongodb://localhost:27017/nodetest2", { native_parser: true });
 
-var routes = require('./routes/index');
-var users = require('./routes/users');
+const routes = require('./routes');
 
-var app = express();
+const app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -25,16 +24,15 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 //Make our db accessible to the router
-app.use(function(req,res,next) {
+app.use((req, res, next) => {
 	req.db = db;
 	next();
 });
-app.use('/', routes);
-app.use('/users', users);
+app.use(routes(express));
 
 /// catch 404 and forward to error handler
-app.use(function(req, res, next) {
-    var err = new Error('Not Found');
+app.use((req, res, next) => {
+    const err = new Error('Not Found');
     err.status = 404;
     next(err);
 });
@@ -44,7 +42,7 @@ app.use(function(req, res, next) {
 // development error handler
 // will print stacktrace
 if (app.get('env') === 'development') {
-    app.use(function(err, req, res, next) {
+    app.use((err, req, res, next) => {
         res.status(err.status || 500);
         res.render('error', {
             message: err.message,
@@ -55,7 +53,7 @@ if (app.get('env') === 'development') {
 
 // production error handler
 // no stacktraces leaked to user
-app.use(function(err, req, res, next) {
+app.use((err, req, res, next) => {
     res.status(err.status || 500);
     res.render('error', {
         message: err.message,
diff --git a/routes/index.js b/routes/index.js
index 896c948..10e4f5c 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,9 +1,7 @@
-var express = require('express');
-var router = express.Router();
+module.exports = router => {
+  router.get('/', (req, res) => {
+    res.render('index', { title: 'Express' });
+  });
 
-/* GET home page. */
-router.get('/', function(req, res) {
-  res.render('index', { title: 'Express' });
-});
-
-module.exports = router;
+  router.use('/users', require('./users'))
+}
diff --git a/routes/users.js b/routes/users.js
index a0064a5..053033b 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -1,29 +1,29 @@
-var express = require('express');
-var router = express.Router();
+const express = require('express');
+const router = express.Router();
 
 /* GET users list. */
-router.get('/userlist', function(req, res) {
-	var db = req.db;
-	db.collection('userlist').find().toArray(function(err, items) {
+router.get('/', (req, res) => {
+	const db = req.db;
+	db.collection('userlist').find().toArray((err, items) => {
 		res.json(items);
 	});
 });
 
-router.post('/adduser', function(req, res) {
-	var db = req.db;
-	db.collection('userlist').insert(req.body, function(err, result){
+router.post('/', (req, res) => {
+	const db = req.db;
+	db.collection('userlist').insert(req.body, (err, result)=> {
 		res.send(
-			(err === null) ? {msg: ''} : {msg:err}
+			(err === null) ? { msg: '' } : { msg:err }
 		);
 	});
 });
 
 //Delete a user
-router.delete('/deleteuser/:id', function(req, res) {
-	var db = req.db;
-	var userToDelete = req.params.id;
-	db.collection('userlist').removeById(userToDelete, function(err, result) {
-		res.send((result === 1)? {msg: ''} : {msg:err});
+router.delete('/:id', (req, res) => {
+	const db = req.db;
+	const userToDelete = req.params.id;
+	db.collection('userlist').removeById(userToDelete, (err, result) => {
+		res.send((result === 1)? { msg: '' } : { msg:err });
 	});
 });