Tidied up a couple of things