Tidy Up

Tidied Up and Broken more code XD