Minor cleanup of server and app.js