cleaining up Event.hs