Clean up double-if
Merge branch 'master' of https://github.com/dwightwatson/validating