Some tidying up of comments, no change of code.