Refactored a bit the clusterer