- listeners refactoring was performed