Use braces around if blocks

Adds { } around the single-line if blocks