Clean up excessive parentheses