Clean up diagrams, simplify arrows