Tidy a few things up in comments, no change of code.