Cleaned the code.
Changed the Events enum implementation.