Some updates to the formatter