Cluster initialization refactoring