Simplify a bit.
Merge pull request #3 from pathable/simplify

Simplify a bit.