Fix last remaining PEP8 errors