Cosmetic improvements.  Deleted commented-out code.