Save current work
Refactoring