Refactoring event states