Events class code review