Rationalized the organization of the distribution
removed an unnecessary property