Lessening distracting changes.

Mostly formatting, and some other changes as
the two branch diverged