Refactoring distributors nad formatters