refactoring
refactoring
Merge branch 'line-lineChart/refactoring' into linePlusBarChart/refactoring
refactored partially