Minor fixes

I removed useless variable and fix annotation of ```fetchAll``` method. I have made also a small refactoring of listener in same method.