Listener availability not dependent on module event
Code cleaning