cosmetic fixes
refactoring dfs + adding dls