Just tidied up a bit.