Comments, and a bit of tidying.