cleaning up web.js and server.js