Pep8 and Python3 cleanup.