Ran pep8 and fixed some things.