several changes per pylint