Simplify IF statements

Coding convention issue - modifying some condition statements to make them a little simplier to understand.