More syncTree refactoring