NeEstimator2 refactoring