refactor cluster diff