Changes to app.js clean up