Improve readability by changing some conditions to one-liners.
Merge pull request #141 from joaoventura/master

Improve readability by changing some conditions to one-liners.