[CLEANUP] Use curly braces around all control structures.