Addressed CR comments

Addressed CR comments