Cleanup Clustering and DisjointSets code a bit more.