Refactoring notifications