Added a bunch of pep8 fixes

Left long lines, since we will fix those as we develop.