COOK-3794 Fix notification

+ cleanup code and logic