Fix output format.  Improve comments.