EventsManager small refactoring