refactor cluster