pylint-suggested improvements