BZ-12025 Mark-up Clean-up on ECM Estimator