Flat Clustering refactoring