cleaning up
events refactoring