cleaning up root.cpp/h