ChartJS addition and some cleanup