Little bit of cleanup (editevent-view)