Event refactoring