refactor (merge from eiriklv/simple-express-boilerplate)