Refactor Cluster class