Started refactoring the formatters.