MuEstimator refactoring