- add dispatch listener class
- cosmetics