Address review comments
Address review comments

rouge8/pip,techtonik/pip,sbidoul/pip,sbidoul/pip,xavfernandez/pip,xavfernandez/pip,pradyunsg/pip,xavfernandez/pip,techtonik/pip,rouge8/pip,techtonik/pip,pypa/pip,pypa/pip,rouge8/pip,pfmoore/pip,pradyunsg/pip,pfmoore/pip