Refactoring distributors nad formatters
Merge pull request #289 from takahi-i/refactoring-distributor

Refactoring distributors nad formatters