Made some C/C++ coding style changes