Implemented code review comments

Implemented code review comments