Cleaned up server.js