Notification module refactor
Refactor