Refactored event