Removed some redundant state
refactored estimator code