Adressing editorial feedback.

--HG--
extra : rebase_source : f9963edfab95dd8d77dcb2fa2dfe2aa7bbff2db9
Addressing editorial feedback

--HG--
extra : rebase_source : 4b18b988bdc28fe2fbc4c6833372a9bc86ced08c