Tidy Up

Tidied up and broken more code XD