Merge pull request #81 from DrMarcII/listener

Code cleanup