cleaning up more and fixing app.js