More refactoring event method