PEP8 fixes cherry picked