Remove some superstilious parens and circumlocuitous syntax