Formatting cleanup - refs #194