code review comments

code review comments