refactoring notifiee