some changes suggested by pylint