Cluster service refactor and cleanup (as a preparation step for future refactor)