pass pep8

This patch make the script pass pep8. No logical changes, it is mostly
whitespaces tweaks.

pep8 ignores E501 'lines too long' though.