Simplify.
Merge pull request #432 from whatthejeff/simplify

Simplify.