Cleaned up preprocessor and kernel estimator