AlphaEstimator refactoring