Refactor NotificationsGenerator