Minor cleanups in EKF estimator