refactoring, notification end