Address some review comments.

--HG--
extra : amend_source : 5cd00caf17bdae19e0193b4329fbd088ed8e843d