Massive Event Refactoring