Refactor and tidied it up :)
Refactor and tidied it up :)