Address CR comments