minor clean ups to c++ models