Refactoring for a distibution