Refoctored a lot of data point code.