Issue #27: Cleaned contact listener class