Pep8

Changes for pep8 code. One commit per file/error pair.