Removed unnecessary begin clauses, removed interrupt rescue