revert ChartEventListener
refactoring
refactoring