Comments tidied up