Fix a couple of inconsistencies
Remove whitespace and unnecessary parens