Clean up formatting.

Fewer callouts is better.