If a diagram is too complex, shouldn't you just add more abstractions? That would simplify the refactoring too.