[#1532] Fix PEP8 issues