Fix missing parens; clean-up