> Small Cleaning of EventDispatcher