more pylint compliance tidying