Small refactor in event service.