event form refactoring