Refactoring notification delivery for #81