Fix refactorization errors
Refactor event handler composition