Fix remaining pep8 errors