Tidied up a little.