Refactor Tree Methods