Massive code refactoring to draw charts without making a combined dataset of time,value1,value2.Code still messy