More formatting cleanup