Cleaning up the excessive parentheses