Additional formatting cleanup