Move for leafs
Refactoring