changes found from pylint and testing