Expand cluster to use set
Only iter over unvisited