Edit Event Refactored