Getting rid of some more pep8 errors