Refactor EventResult
Merge branch 'hotfix/Remove_Event_from_Result'