Clean up EventController a bit to appease CodeClimate (and, y'know, because clean code is good!)