Cleanup and simplify all the directory variables