Some adjustments for more C++ style.