Add braces to if statements and ensure correct use of variables (#5049)

Add braces to if statements and ensure correct use of variables (#5049) #405