Fix comment from Code review
Fix comment from Code Review