little event refactoring