Refactored controller event listeners