Some formatting cleanup.