Refactoring code repeat
Refactoring save repeat options