cleaning up server.js