Code refactoring, testing Event classes