Removed unnecessary classes
Refactored events