Refactoring to Event constructor