More reworking to conform (better) with pylint default guidelines