Removed the last of the C++ style comments. Adjusted the coding style a bit.