Notifications to user, and code refactor.