Tidied up a few things
Tidied up a few things