establishing an saving point
Dramatic refactoring