Cleanup, nameing, pep8 removed unused import. No -