cleaned up some code
Merge remote-tracking branch 'upstream/clusterAlgorithms' into clusterAlgorithms