General cleanup
Tidied