Remove useless variable
Refactor listener
Fix annotation
Merge pull request #111 from neeckeloo/remove-useless-variable

Minor fixes