Tidied up a little bit