PEP8 cleanup
PEP8 cleanup
Merge branch 'python_tidy'