Add code review comments -- Tom