Cluster Refactoring and adjustments