Listening event refactoring