Added few C++ refactoring utilities