More pep8 polish.