remove unnecessary parentheses
remove old comments