Simple events refactoring.