Fix style errors revealed by pep8