Tidied up some things
Tidied up some things