notify refactor