Refs #10507. cleanup formatting