Tidied up formatting.