From 5274d53d184e42ff835407334dab79bffc05f951 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Wed, 16 Feb 2022 23:12:43 +0100
Subject: [PATCH] refactoring

---
 src/HowBadIsMyBatch.ipynb | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index 36f4d037481..fad766997ac 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -1129,15 +1129,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def getAllVaers():\n",
-    "    return _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n",
-    "\n",
-    "def getNonDomesticVaers():\n",
-    "    return _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
-    "\n",
-    "def getInternationalVaers():\n",
-    "    return pd.concat([getAllVaers(), getNonDomesticVaers()])\n",
-    "\n",
     "def getVaersForYear(year):\n",
     "    return _getVaers(lambda: [_getVaersDescrReader().readVaersDescrForYear(year)])\n",
     "\n",
@@ -1149,37 +1140,41 @@
     "    return dataFrame\n",
     "\n",
     "def _getVaersDescrReader():\n",
-    "    return VaersDescrReader(dataDir = \"VAERS\")"
+    "    return VaersDescrReader(dataDir = \"VAERS\")\n",
+    "    "
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9ee014eb",
+   "id": "8e3bc9b3",
    "metadata": {},
    "outputs": [],
    "source": [
-    "vaers = getAllVaers()"
+    "vaers = _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n",
+    "vaers"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "c96391fc",
+   "id": "fbf5006a",
    "metadata": {},
    "outputs": [],
    "source": [
-    "nonDomesticVaers = getNonDomesticVaers()"
+    "nonDomesticVaers = _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
+    "nonDomesticVaers"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "404b496a",
+   "id": "781ac80e",
    "metadata": {},
    "outputs": [],
    "source": [
-    "internationalVaers = getInternationalVaers()"
+    "internationalVaers = pd.concat([vaers, nonDomesticVaers])\n",
+    "internationalVaers"
    ]
   },
   {