Fix whitespace
Hack up for compatibility between Python versions
pep8