Tidied up the code a little bit