Tidied up code before pushing to heroku