further reducing server.js