refactoring (contd.)
listeners refactored