Refactoring of event