cleaning up, getting rid of fluff and moved everything into app.js