refactoring code

Problem: The Events class object creation misses some events, so I’m
starting to refactor