Cleaning up redundancy in CanaryMessageOfTheDayListener