Refactor listen! / unlisten!
listen-unlisten refactor
Starting a clean up ...