Tidied up a bit.