replaced some 'std::' with 'extra::' in comments