comments, and removing some extraneous parens