dead code removal
more consistent use of parens