Changes to get a 10/10 score from pylint