Further work with pylint. No functional changes.
Pylint, score (-9.64/10)