[Notification] improved code readability