Refactoring/notification