Some optimisation in clusterer