tex: Style Estimator cleanup I