Rework event listener intro