Clean up event participant logic and class structure