Formatting, minor clean-ups.
6 files changed