fixup! Refactor to improve readability
fixup! Block: Split creation and formatting of diagram
fixup! MergeFrontier: Split creation and formatting of diagram