Event more refactoring.