Replaced if (<statement>) return true; return false with return <statement>
Merge pull request #1 from powerje/master

Simplify return condition