Refactored & ready for Heroku
Minor