Revert "more cleaning thanks to pylint"

This reverts commit 97e893bef259983b6df9080c8c8894229b2cc9b5.
Revert "some fixes suggestsed by pylint"

This reverts commit ed8eaef84f34ce4e38e5773948540082a444bfe8.