LGTM. 

As a side note, I think we should also import cluster_metric similarly just so that its consistent. Do you want to add that in this pull request? (I doubt we will come back to it later)