ClusterSource makeClusters moved into getClusters