cleaned up server.js