refactoring
Merge branch 'historicalBar-historicalBarChart/refactoring' into linePlusBarChart/refactoring
linePlusBarChart