Quick wins in the event handler