Use more C++ style