Coherence refactoring