Separated out EventListener creation and ensured they are added and removed correctly
Separated out EventListener creation and ensured they are added and removed correctly

sareh/pasur,sareh/pasur,sareh/pasur