Merge "Refactor tree utils"