Simplify code
Merge pull request #1 from domoritz/patch-1

Simplify code