Trivial style changes, replace a few C++ type comments, and some code reuse