Addressed code review comments

Addressed code review comments