Refactored data point generation out of graph building