refactoring of duplicate code
refactor duplicate use of event names