Improve event listeners