minor c++ification