Apply suggestions from code review
Apply suggestions from code review

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