More pep8 and cosmetic changes.