ceaned up dfs.scm a bit