improvements to the formatter