Tidied up the code a little