minor refactor in the EventModelManager