Simplify event listeners