pep8 cleanup and removed unused import