supervisor tree refactorings