Issue #86: Refactored mouse listeners