Code

C++ cleanup on patch.