Refactor + NotificationCenter