Clean up of app.js