Doc ++ code cleanup