Refactor Notifications