Cleanup on app.js