NO-ISSUE refactoring EventScreen

NO-ISSUE refactoring EventScreen