refactoring listener

renamed the class and variables