Better bracing and variable name