simplify
Merge pull request #1 from haarg/simpler

simplify