pep8 and python3 fixes.