Backup before branch: Refactoring stage 2