Some more pep8 errors fixed