Extroot scripts code improvements (3)