Extroot scripts code improvements