Correction + refactoring subtree transplant