Refactoring and Improvement of Distribution