[#2041] PEP8 compliance