Clean up uneeded braces