Juxta.Notification refactoring