Move listeners to separate classes.