Refactor datapoint to use (X, y) scikit data structure instead of tuples per point