Refactoring in cluster