Cluster refactoring
cluster refactoring