Cleaning up formatting; refs #7