Instead of having one class for each cluster type only have SingleServerCluster and MultipleServerCluster. Along with some other refactoring.