fixed indent, unnecessary parens, and trailing ws