update param name
parenthesize conditions