Clean up app.js a bit more???