selective re-format

Only includes format changes that seem reasonable.