refactoring
Clustering!