[#1682] Fix pep8 issues