Code changes for code review comments

Code changes for code review comments