[#1633] PEP8 and pylint stuff