Reorganize formatters