Some cleanup and now a new notification type