no need for else blocks if prev statement returns
Merge pull request #40 from bgentry/more-lint-fixes

no need for else blocks if prev statement returns