Small modifications to the formatter.