More formatting cleanup.