Simplify listening logic