Before Retry block

Simplified various used arguments.
Made it possible to create as an object.