Finish cleaning up pylint violations