Incorporated review comments

Incorporated review comments