move conditionsl logic and remove parens per lint #13157