YodaConditionsFixer - simplify code