[ABW]: indents, mixed EOFs and other style problems caught during merge

[Fix] action_catcher scope guard was ineffective because it was unnamed (caught by linter)