Refactoring in saved options