remove `return`s and clean up some conditionals
Merge pull request #190 from crymer11/master

remove `return`s and clean up some conditionals