Shortened conditions

Refactored to 1-condition statement.