A few adjustments to the formatter made.