Tidying for heroku deploy