More cleanup of app.js