Cosmetic improvements.  Removed commented-out code.