cleanup of cvaluation, some fiddling with simplifieing