Style changes for Estimator