cluster diff refactors