Just tidied up code.