Event refactoring.