Pep8 fixes

pep8-cleaned some files.