Add code review from Thursday CR session