Solves problem of removing dep directory. Fixes function 'rm-if-empty' and changes names of variables
Aligns user defined variables