Reformat, added recommended parentheses