Refactoring notification sender integration