Cleaning the event type form, moving code to better locations.