Separated listeners into stand-alone classes.