Group env variables
Fix Loops
Delete tempdirs
utils.files -> utils.units