Cosmetic improvements.  Added comments.