pep8 cleanup
Merge remote-tracking branch 'refs/remotes/kali/bug/pep8-fixes' into develop