Issue #12: refactoring notification