Enh: Refactor bailout and edit message