EventHandler code cleanup