Lots of comment and formatting changes.  Should be no code chages since the last commit.