using tertiary operators and boolean operators instead of if/else and typeof operators
Merge branch 'master' of https://github.com/anthony-nardi/OO-Events-Model