Refactoring on DistribNumber state