cleaning up app.js in effort to make things more standardised. #13