Refactor ZKCluster