tiny refactoring to events model