Tweak layout
Remove unnecessary parentheses