Incorporate suggestions from code reviews.

Signed-off-by: Binh Vu <bvu@paypal.com>