cleaned up and set up for heroku launch