Tidied up a bit

Tidied up a bit