Various cosmetic changes.

5 files changed