Refactor/simplify grow_leaves