[#1386] PEP8 fixes