refactoring in restore notifier