refactoring and chart styling
refactoring and chart styling