Clean up if statements
Clean up if statements

This should make Luis happy.

jrha/release,jrha/release,brunocanning/release,quattor/release,stdweird/release,wdpypere/release,jouvin/release,stdweird/release,brunocanning/release,brunocanning/release,jrha/release,wdpypere/release,wdpypere/release,quattor/release,jouvin/release,jouvin/release,quattor/release