Tidied up a little