cleaned up charting