Tidied up a few things