cleanup and homogeneity