[c++]
 + clean ups