Minor formatting and tinkering.