notify: refactor