minor conditional cleanup
Merge pull request #24 from jlambert121/cond_cleanup

minor conditional cleanup