refactoring, notification