Include more curly braces around variables to improve readability - no functional changes