Changes to formatters and cli