Minor cleanups to format_control.py
Minor cleanups to format_control.py

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