Added parenthesis to if statements (better sonar default compliance)