minor refactoring events