Clusters refactured