C++ Refactoring - not ready yet