refactors to make cluster diff more testable