Refactoring

warning, eventName, channelName

channelName is optional, the others aren't.