fixed minor defect
cleaned up event model methods