Doing the clustering right