Remove useless typing
Fold directly in the EventStore class
Make it even more functional