more tweaks to pylint code