Cleaned up if statement
Merge pull request #163 from levigross/master

stage1: simplify if statement