C++ Update

Update to C++ will begin shortly, this was essential for readability