Logging pattern fix
Extracted the event handling code in a dedicated listener class