diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index 5d75ae89f97..b32f6b600cb 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -249,19 +249,20 @@
    "source": [
     "class CompanyColumnAdder:\n",
     "    \n",
-    "    @staticmethod\n",
-    "    def addCompanyColumn(batchCodeTable, companyByBatchCodeTable):\n",
+    "    def __init__(self, dataFrame_VAX_LOT_VAX_MANU):\n",
+    "        self.dataFrame_VAX_LOT_VAX_MANU = dataFrame_VAX_LOT_VAX_MANU\n",
+    "\n",
+    "    def addCompanyColumn(self, batchCodeTable):\n",
     "        return pd.merge(\n",
     "            batchCodeTable,\n",
-    "            companyByBatchCodeTable,\n",
+    "            self._createCompanyByBatchCodeTable(),\n",
     "            how = 'left',\n",
     "            left_index = True,\n",
     "            right_index = True,\n",
     "            validate = 'one_to_one')\n",
     "\n",
-    "    @staticmethod\n",
-    "    def createCompanyByBatchCodeTable(dataFrame):\n",
-    "        manufacturerByBatchCodeTable = dataFrame[['VAX_LOT', 'VAX_MANU']]\n",
+    "    def _createCompanyByBatchCodeTable(self):\n",
+    "        manufacturerByBatchCodeTable = self.dataFrame_VAX_LOT_VAX_MANU[['VAX_LOT', 'VAX_MANU']]\n",
     "        manufacturerByBatchCodeTable = manufacturerByBatchCodeTable.drop_duplicates(subset = ['VAX_LOT'])\n",
     "        manufacturerByBatchCodeTable = manufacturerByBatchCodeTable.set_index('VAX_LOT')\n",
     "        return manufacturerByBatchCodeTable.rename(columns = {\"VAX_MANU\": \"Company\"})"
@@ -278,6 +279,7 @@
     "\n",
     "    def __init__(self, dataFrame: pd.DataFrame):\n",
     "        self.dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
+    "        self.companyColumnAdder = CompanyColumnAdder(self.dataFrame)\n",
     "        self.countryBatchCodeTable = SummationTableFactory.createSummationTable(\n",
     "            self.dataFrame.groupby(\n",
     "                [\n",
@@ -292,9 +294,7 @@
     "        return self._postProcess(self._getBatchCodeTableByCountry(country))\n",
     "\n",
     "    def _postProcess(self, batchCodeTable):\n",
-    "        batchCodeTable = CompanyColumnAdder.addCompanyColumn(\n",
-    "            batchCodeTable,\n",
-    "            CompanyColumnAdder.createCompanyByBatchCodeTable(self.dataFrame))\n",
+    "        batchCodeTable = self.companyColumnAdder.addCompanyColumn(batchCodeTable)\n",
     "        batchCodeTable = batchCodeTable[\n",
     "            [\n",
     "                'Adverse Reaction Reports',\n",
@@ -727,14 +727,6 @@
     "    country = 'Global',\n",
     "    minADRsForLethality = minADRsForLethality)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "258adf58",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {