'try / finally' clauses, some rearrangement of code and documentation