Some declaration mods for more C++ style.