server.js: cleaning up