Code review comments addressed.

Auditors: pl