Tidied up code.