diff --git a/config/docker-compose.py b/config/docker-compose.py
index 6e9a420f..824ea030 100644
--- a/config/docker-compose.py
+++ b/config/docker-compose.py
@@ -17,7 +17,9 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://cache:6379/1",
-        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        },
     }
 }
 
diff --git a/config/docker.py b/config/docker.py
index 1eb180de..707510de 100755
--- a/config/docker.py
+++ b/config/docker.py
@@ -17,7 +17,9 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://127.0.0.1:6379/1",
-        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        },
     }
 }
 
diff --git a/config/local.py b/config/local.py
index c9f568ed..4f1f3c22 100755
--- a/config/local.py
+++ b/config/local.py
@@ -7,7 +7,11 @@ DATABASES = {
     }
 }
 
-CACHES = {"default": {"BACKEND": "django.core.cache.backends.dummy.DummyCache",}}
+CACHES = {
+    "default": {
+        "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+    }
+}
 
 DEBUG = True
 TASTYPIE_FULL_DEBUG = True
diff --git a/config/settings.py b/config/settings.py
index adb7a80c..04bb81ab 100755
--- a/config/settings.py
+++ b/config/settings.py
@@ -72,7 +72,9 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://127.0.0.1:6379/1",
-        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        },
     }
 }
 
diff --git a/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py b/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py
index 3ef0dccb..109365ff 100644
--- a/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py
+++ b/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py
@@ -54,7 +54,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -98,7 +100,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -125,7 +129,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -160,7 +166,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -197,7 +205,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -214,7 +224,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=30)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -241,7 +253,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -266,7 +280,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -303,7 +319,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -377,7 +395,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -414,7 +434,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -451,7 +473,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -488,7 +512,9 @@ class Migration(migrations.Migration):
                 ("likes_flavor_id", models.IntegerField()),
                 ("game_index", models.IntegerField()),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -516,7 +542,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -536,7 +564,9 @@ class Migration(migrations.Migration):
                 ("is_battle_only", models.BooleanField(default=False)),
                 ("game_index", models.IntegerField()),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -573,7 +603,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -600,7 +632,10 @@ class Migration(migrations.Migration):
             ),
             preserve_default=True,
         ),
-        migrations.RemoveField(model_name="type", name="damage_class_id",),
+        migrations.RemoveField(
+            model_name="type",
+            name="damage_class_id",
+        ),
         migrations.CreateModel(
             name="NatureName",
             fields=[
@@ -635,7 +670,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -661,7 +698,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -687,7 +726,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -724,7 +765,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -741,7 +784,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=30)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -778,7 +823,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -796,7 +843,9 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=30)),
                 ("formula", models.CharField(max_length=500)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -833,7 +882,9 @@ class Migration(migrations.Migration):
                 ),
                 ("description", models.CharField(default="", max_length=1000)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -867,7 +918,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -884,7 +937,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=30)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -921,7 +976,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -950,7 +1007,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -967,7 +1026,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=30)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1004,7 +1065,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1055,7 +1118,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1072,7 +1137,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1119,7 +1186,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1145,7 +1214,9 @@ class Migration(migrations.Migration):
                 ("flinch_chance", models.IntegerField()),
                 ("stat_chance", models.IntegerField()),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1162,7 +1233,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=30)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1199,7 +1272,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1216,7 +1291,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=30)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1253,7 +1330,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1290,7 +1369,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1327,7 +1408,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1344,7 +1427,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=30)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1381,7 +1466,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -1822,8 +1909,14 @@ class Migration(migrations.Migration):
             field=models.IntegerField(null=True, blank=True),
             preserve_default=True,
         ),
-        migrations.RemoveField(model_name="movemeta", name="drain",),
-        migrations.RemoveField(model_name="movemeta", name="healing",),
+        migrations.RemoveField(
+            model_name="movemeta",
+            name="drain",
+        ),
+        migrations.RemoveField(
+            model_name="movemeta",
+            name="healing",
+        ),
         migrations.AlterField(
             model_name="movemeta",
             name="ailment_chance",
@@ -1884,7 +1977,10 @@ class Migration(migrations.Migration):
             field=models.IntegerField(null=True, blank=True),
             preserve_default=True,
         ),
-        migrations.RemoveField(model_name="stat", name="damage_class_id",),
+        migrations.RemoveField(
+            model_name="stat",
+            name="damage_class_id",
+        ),
         migrations.AddField(
             model_name="stat",
             name="move_damage_class",
@@ -1930,7 +2026,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -1964,7 +2062,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2001,7 +2101,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2029,7 +2131,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2046,7 +2150,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2065,7 +2171,9 @@ class Migration(migrations.Migration):
                 ("region_id", models.IntegerField(null=True, blank=True)),
                 ("is_main_series", models.BooleanField(default=False)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2102,7 +2210,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2138,7 +2248,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2160,7 +2272,9 @@ class Migration(migrations.Migration):
                 ("base_experience", models.IntegerField()),
                 ("is_default", models.BooleanField(default=False)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2198,7 +2312,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2215,7 +2331,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2252,7 +2370,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2278,7 +2398,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2303,7 +2425,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2339,7 +2463,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2379,7 +2505,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2416,7 +2544,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2454,7 +2584,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2491,7 +2623,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2508,7 +2642,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2545,7 +2681,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2580,7 +2718,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2628,7 +2768,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2645,7 +2787,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2682,7 +2826,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2699,7 +2845,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2737,7 +2885,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2825,7 +2975,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2862,7 +3014,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2909,7 +3063,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2947,7 +3103,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -2985,7 +3143,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3022,7 +3182,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -3164,7 +3326,8 @@ class Migration(migrations.Migration):
             new_name="baby_evolution_item_id",
         ),
         migrations.RemoveField(
-            model_name="evolutionchain", name="baby_evolution_item_id",
+            model_name="evolutionchain",
+            name="baby_evolution_item_id",
         ),
         migrations.AlterField(
             model_name="abilityflavortext",
@@ -3188,10 +3351,17 @@ class Migration(migrations.Migration):
             new_name="held_item_id",
         ),
         migrations.RemoveField(
-            model_name="pokemonevolution", name="evolution_item_id",
+            model_name="pokemonevolution",
+            name="evolution_item_id",
+        ),
+        migrations.RemoveField(
+            model_name="pokemonevolution",
+            name="held_item_id",
+        ),
+        migrations.RemoveField(
+            model_name="pokemonevolution",
+            name="location_id",
         ),
-        migrations.RemoveField(model_name="pokemonevolution", name="held_item_id",),
-        migrations.RemoveField(model_name="pokemonevolution", name="location_id",),
         migrations.AlterField(
             model_name="pokemonevolution",
             name="min_affection",
@@ -3229,7 +3399,9 @@ class Migration(migrations.Migration):
             preserve_default=True,
         ),
         migrations.RenameField(
-            model_name="pokemonform", old_name="is_mega_form_order", new_name="is_mega",
+            model_name="pokemonform",
+            old_name="is_mega_form_order",
+            new_name="is_mega",
         ),
         migrations.AddField(
             model_name="pokemonform",
@@ -3308,7 +3480,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3327,7 +3501,9 @@ class Migration(migrations.Migration):
                 ("cost", models.IntegerField(null=True, blank=True)),
                 ("fling_power", models.IntegerField(null=True, blank=True)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3344,7 +3520,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3381,7 +3559,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3398,7 +3578,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3445,7 +3627,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3499,7 +3683,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3536,7 +3722,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3553,7 +3741,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3590,7 +3780,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -3704,7 +3896,9 @@ class Migration(migrations.Migration):
                 ("soil_dryness", models.IntegerField()),
                 ("smoothness", models.IntegerField()),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3721,7 +3915,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3758,7 +3954,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3775,7 +3973,9 @@ class Migration(migrations.Migration):
                 ),
                 ("flavor", models.IntegerField()),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3846,7 +4046,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -3885,7 +4087,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -3924,7 +4128,9 @@ class Migration(migrations.Migration):
             preserve_default=True,
         ),
         migrations.RenameField(
-            model_name="nature", old_name="hates_flavor_id", new_name="hates_flavor",
+            model_name="nature",
+            old_name="hates_flavor_id",
+            new_name="hates_flavor",
         ),
         migrations.AlterField(
             model_name="nature",
@@ -3939,7 +4145,9 @@ class Migration(migrations.Migration):
             preserve_default=True,
         ),
         migrations.RenameField(
-            model_name="nature", old_name="likes_flavor_id", new_name="likes_flavor",
+            model_name="nature",
+            old_name="likes_flavor_id",
+            new_name="likes_flavor",
         ),
         migrations.AlterField(
             model_name="nature",
@@ -3967,7 +4175,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4004,11 +4214,19 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
-        migrations.RemoveField(model_name="generation", name="main_region_id",),
-        migrations.RemoveField(model_name="pokedex", name="region_id",),
+        migrations.RemoveField(
+            model_name="generation",
+            name="main_region_id",
+        ),
+        migrations.RemoveField(
+            model_name="pokedex",
+            name="region_id",
+        ),
         migrations.AddField(
             model_name="generation",
             name="region",
@@ -4064,7 +4282,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4091,7 +4311,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4126,7 +4348,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4163,7 +4387,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4200,7 +4426,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4237,7 +4465,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4282,7 +4512,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4299,7 +4531,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4336,7 +4570,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4363,7 +4599,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4434,7 +4672,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4452,7 +4692,9 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=100)),
                 ("order", models.IntegerField(null=True, blank=True)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4489,7 +4731,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4527,7 +4771,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -4568,7 +4814,9 @@ class Migration(migrations.Migration):
                 ("base_score", models.IntegerField()),
                 ("rate", models.IntegerField()),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4585,7 +4833,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4622,7 +4872,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4639,7 +4891,9 @@ class Migration(migrations.Migration):
                 ),
                 ("name", models.CharField(max_length=100)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -4676,7 +4930,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5195,7 +5451,9 @@ class Migration(migrations.Migration):
             preserve_default=True,
         ),
         migrations.RenameField(
-            model_name="pokemonform", old_name="form_identifier", new_name="form_name",
+            model_name="pokemonform",
+            old_name="form_identifier",
+            new_name="form_name",
         ),
         migrations.AddField(
             model_name="pokemonmove",
@@ -5242,7 +5500,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5279,7 +5539,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5315,7 +5577,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AddField(
@@ -5382,7 +5646,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5418,7 +5684,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5453,7 +5721,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5489,7 +5759,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5526,7 +5798,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5563,7 +5837,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5600,7 +5876,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5637,7 +5915,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AlterField(
@@ -5722,7 +6002,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5760,7 +6042,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5798,7 +6082,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5835,7 +6121,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5872,7 +6160,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5909,7 +6199,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5946,7 +6238,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.CreateModel(
@@ -5983,7 +6277,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AlterField(
@@ -6103,10 +6399,15 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
-        migrations.RemoveField(model_name="berryflavor", name="flavor",),
+        migrations.RemoveField(
+            model_name="berryflavor",
+            name="flavor",
+        ),
         migrations.AddField(
             model_name="berryflavor",
             name="name",
@@ -6184,7 +6485,9 @@ class Migration(migrations.Migration):
                 ),
                 ("effect", models.CharField(max_length=6000)),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
             bases=(models.Model,),
         ),
         migrations.AlterField(
@@ -6211,9 +6514,18 @@ class Migration(migrations.Migration):
             ),
             preserve_default=True,
         ),
-        migrations.RemoveField(model_name="move", name="contest_effect_id",),
-        migrations.RemoveField(model_name="move", name="contest_type_id",),
-        migrations.RemoveField(model_name="move", name="super_contest_effect_id",),
+        migrations.RemoveField(
+            model_name="move",
+            name="contest_effect_id",
+        ),
+        migrations.RemoveField(
+            model_name="move",
+            name="contest_type_id",
+        ),
+        migrations.RemoveField(
+            model_name="move",
+            name="super_contest_effect_id",
+        ),
         migrations.AddField(
             model_name="move",
             name="contest_effect",
diff --git a/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py b/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py
index 8fa7cd83..b845fd66 100644
--- a/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py
+++ b/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py
@@ -32,7 +32,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
         migrations.CreateModel(
             name="PokemonFormSprites",
@@ -58,7 +60,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
         migrations.CreateModel(
             name="PokemonSprites",
@@ -84,6 +88,8 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
     ]
diff --git a/pokemon_v2/migrations/0009_pokemontypepast.py b/pokemon_v2/migrations/0009_pokemontypepast.py
index 44bfa453..2c8a4309 100644
--- a/pokemon_v2/migrations/0009_pokemontypepast.py
+++ b/pokemon_v2/migrations/0009_pokemontypepast.py
@@ -55,6 +55,8 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
     ]
diff --git a/pokemon_v2/tests.py b/pokemon_v2/tests.py
index 44e4ac56..80ad05d1 100644
--- a/pokemon_v2/tests.py
+++ b/pokemon_v2/tests.py
@@ -17,7 +17,9 @@ class APIData:
     @classmethod
     def setup_gender_data(cls, name="gndr"):
 
-        gender = Gender.objects.create(name=name,)
+        gender = Gender.objects.create(
+            name=name,
+        )
         gender.save()
 
         return gender
@@ -27,7 +29,11 @@ class APIData:
     def setup_language_data(cls, name="lang"):
 
         language = Language.objects.create(
-            iso639="ts", iso3166="tt", name=name, official=True, order=1,
+            iso639="ts",
+            iso3166="tt",
+            name=name,
+            official=True,
+            order=1,
         )
         language.save()
 
@@ -115,7 +121,10 @@ class APIData:
     @classmethod
     def setup_version_data(cls, version_group=None, name="ver"):
 
-        version = Version.objects.create(name=name, version_group=version_group,)
+        version = Version.objects.create(
+            name=name,
+            version_group=version_group,
+        )
         version.save()
 
         return version
@@ -218,7 +227,9 @@ class APIData:
     @classmethod
     def setup_item_attribute_data(cls, name="itm attr"):
 
-        item_attribute = ItemAttribute.objects.create(name=name,)
+        item_attribute = ItemAttribute.objects.create(
+            name=name,
+        )
         item_attribute.save()
 
         return item_attribute
@@ -260,7 +271,9 @@ class APIData:
     @classmethod
     def setup_item_fling_effect_data(cls, name="itm flng efct"):
 
-        item_fling_effect = ItemFlingEffect.objects.create(name=name,)
+        item_fling_effect = ItemFlingEffect.objects.create(
+            name=name,
+        )
         item_fling_effect.save()
 
         return item_fling_effect
@@ -282,7 +295,9 @@ class APIData:
     @classmethod
     def setup_item_pocket_data(cls, name="itm pkt"):
 
-        item_pocket = ItemPocket.objects.create(name=name,)
+        item_pocket = ItemPocket.objects.create(
+            name=name,
+        )
         item_pocket.save()
 
         return item_pocket
@@ -417,7 +432,9 @@ class APIData:
     @classmethod
     def setup_contest_type_data(cls, name="cntst tp"):
 
-        contest_type = ContestType.objects.create(name=name,)
+        contest_type = ContestType.objects.create(
+            name=name,
+        )
         contest_type.save()
 
         return contest_type
@@ -473,7 +490,9 @@ class APIData:
     @classmethod
     def setup_super_contest_effect_data(cls, appeal=2):
 
-        super_contest_effect = SuperContestEffect.objects.create(appeal=appeal,)
+        super_contest_effect = SuperContestEffect.objects.create(
+            appeal=appeal,
+        )
         super_contest_effect.save()
 
         return super_contest_effect
@@ -522,7 +541,9 @@ class APIData:
     @classmethod
     def setup_berry_firmness_data(cls, name="bry frmns"):
 
-        berry_firmness = BerryFirmness.objects.create(name=name,)
+        berry_firmness = BerryFirmness.objects.create(
+            name=name,
+        )
         berry_firmness.save()
 
         return berry_firmness
@@ -590,7 +611,9 @@ class APIData:
     @classmethod
     def setup_egg_group_data(cls, name="egg grp"):
 
-        egg_group = EggGroup.objects.create(name=name,)
+        egg_group = EggGroup.objects.create(
+            name=name,
+        )
         egg_group.save()
 
         return egg_group
@@ -1271,7 +1294,9 @@ class APIData:
     ):
 
         nature_pokeathlon_stat = NaturePokeathlonStat.objects.create(
-            nature=nature, pokeathlon_stat=pokeathlon_stat, max_change=max_change,
+            nature=nature,
+            pokeathlon_stat=pokeathlon_stat,
+            max_change=max_change,
         )
         nature_pokeathlon_stat.save()
 
@@ -1302,7 +1327,10 @@ class APIData:
 
         region = region or cls.setup_region_data(name="rgn for " + name)
 
-        pokedex = Pokedex.objects.create(name=name, region=region,)
+        pokedex = Pokedex.objects.create(
+            name=name,
+            region=region,
+        )
         pokedex.save()
 
         return pokedex
@@ -1349,7 +1377,9 @@ class APIData:
     @classmethod
     def setup_pokemon_habitat_data(cls, name="pkm hbtt"):
 
-        pokemon_habitat = PokemonHabitat.objects.create(name=name,)
+        pokemon_habitat = PokemonHabitat.objects.create(
+            name=name,
+        )
         pokemon_habitat.save()
 
         return pokemon_habitat
@@ -1369,7 +1399,9 @@ class APIData:
     @classmethod
     def setup_pokemon_color_data(cls, name="pkm clr"):
 
-        pokemon_color = PokemonColor.objects.create(name=name,)
+        pokemon_color = PokemonColor.objects.create(
+            name=name,
+        )
         pokemon_color.save()
 
         return pokemon_color
@@ -1389,7 +1421,9 @@ class APIData:
     @classmethod
     def setup_pokemon_shape_data(cls, name="pkm shp"):
 
-        pokemon_shape = PokemonShape.objects.create(name=name,)
+        pokemon_shape = PokemonShape.objects.create(
+            name=name,
+        )
         pokemon_shape.save()
 
         return pokemon_shape
@@ -1765,7 +1799,9 @@ class APIData:
     @classmethod
     def setup_evolution_trigger_data(cls, name="evltn trgr"):
 
-        evolution_trigger = EvolutionTrigger.objects.create(name=name,)
+        evolution_trigger = EvolutionTrigger.objects.create(
+            name=name,
+        )
         evolution_trigger.save()
 
         return evolution_trigger
@@ -3324,8 +3360,10 @@ class APITests(APIData, APITestCase):
     def test_super_contest_effect_api(self):
 
         super_contest_effect = self.setup_super_contest_effect_data(appeal=10)
-        super_contest_effect_flavor_text = self.setup_super_contest_effect_flavor_text_data(
-            super_contest_effect, flavor_text="base spr cntst efct flvr txt"
+        super_contest_effect_flavor_text = (
+            self.setup_super_contest_effect_flavor_text_data(
+                super_contest_effect, flavor_text="base spr cntst efct flvr txt"
+            )
         )
         move = self.setup_move_data(
             name="mv for base spr cntst efct", super_contest_effect=super_contest_effect
@@ -4541,8 +4579,10 @@ class APITests(APIData, APITestCase):
         pokemon_species_name = self.setup_pokemon_species_name_data(
             pokemon_species, name="base pkmn shp name"
         )
-        pokemon_species_form_description = self.setup_pokemon_species_form_description_data(
-            pokemon_species, description="frm dscr for pkmn spcs"
+        pokemon_species_form_description = (
+            self.setup_pokemon_species_form_description_data(
+                pokemon_species, description="frm dscr for pkmn spcs"
+            )
         )
         pokemon_species_flavor_text = self.setup_pokemon_species_flavor_text_data(
             pokemon_species, flavor_text="flvr txt for pkmn spcs"
@@ -5261,11 +5301,14 @@ class APITests(APIData, APITestCase):
         evolution_chain = self.setup_evolution_chain_data()
 
         basic = self.setup_pokemon_species_data(
-            name="wurmple", evolution_chain=evolution_chain,
+            name="wurmple",
+            evolution_chain=evolution_chain,
         )
 
         stage_one_first = self.setup_pokemon_species_data(
-            name="silcoon", evolves_from_species=basic, evolution_chain=evolution_chain,
+            name="silcoon",
+            evolves_from_species=basic,
+            evolution_chain=evolution_chain,
         )
         stage_one_first_evolution = self.setup_pokemon_evolution_data(
             evolved_species=stage_one_first, min_level=7
@@ -5281,7 +5324,9 @@ class APITests(APIData, APITestCase):
         )
 
         stage_one_second = self.setup_pokemon_species_data(
-            name="cascoon", evolves_from_species=basic, evolution_chain=evolution_chain,
+            name="cascoon",
+            evolves_from_species=basic,
+            evolution_chain=evolution_chain,
         )
         stage_one_second_evolution = self.setup_pokemon_evolution_data(
             evolved_species=stage_one_second, min_level=7