Finalizing PEP8 fixes