Tidy up some comments, whitespace.