Simplify conditional logic
Merge pull request #2 from frewsxcv/patch-1

Simplify conditional logic