Refactoring grouped bar chart...incomplete