Tidy up and improve comments.