made the 'EventDispatchHandler' more 'best-practice'