refactoring notifications