Improved and cleaned Listenable stuff