Address additional code review results.