Minor tidying up of whitespace and comments.