simplifying

simplifying
Merge pull request #2 from evm/simplify

simplifying