Fix parens and PEP8 cleanup