Refactor Erwin Jarvis; moved Event related methods into Event
Shorthand If statements for some cleaner code?