Pylint/pep8 violations cleanup