fix notification bug
refactor