fixed CR comments