Store listener keys into an array instead of individual variables
Merge pull request #766 from fredj/cleanup

Cleanup