Clean up Charting a bit