Addressed Code review comments
Addressed Code review comments