Refactor Listner.py

untested