Tidied up code just a tiny bit.