Cleaning up server.js