Shorten the parameters passed to ds
Adjust the uses of ds to reflect the new definition
Merge pull request #73 from joichiro/simplify_ds

Simplify ds