Minimizing listener and removing redundancy