COSMIT fixing some unused imports, adding stuff to __all__,  and light pep8 (not all whitespace to make rebasing less painful)