Formatting.

Many stylistic changes, mostly formatting code more closely to the
coding style.