[ExCvTh] code clean up