Refactored: Event Delegation