Conformized code to current C++ coding standards