Fixed code review comment items