simplify

caveat: totally untested
Merge pull request #1 from ggreif/patch-1

simplify