Cleaning up Event class

Removing redundant types, and renaming Accumulate back to Accum