Refactor out some parens