pep8 happy
Merge remote-tracking branch 'kali/bug/pep8_cleanup' into develop