More formatting cleanup for 1 – 6