pep8 clean up
Merge pull request #6524 from michaelrice/tc-pep8

pep8 clean up