Add proper retraining for cross-validation grid_search