Address code review comments.

Auditors: pl