better naming of event listeners