diff --git a/IGP/PageLayout.razor b/IGP/PageLayout.razor
index 71a8d3e..9321d4e 100644
--- a/IGP/PageLayout.razor
+++ b/IGP/PageLayout.razor
@@ -48,7 +48,7 @@
                 <MudIcon Icon="fa-solid fa-clipboard-list" Class="mr-2"/>
                 Database
             </MudButton>
-            
+
             <MudButton Href="/data-tables"
                        Variant="Variant.Text"
                        Color="Color.Default"
diff --git a/IGP/Pages/DataTables/DataTablesPage.razor b/IGP/Pages/DataTables/DataTablesPage.razor
index eea4ad9..4352934 100644
--- a/IGP/Pages/DataTables/DataTablesPage.razor
+++ b/IGP/Pages/DataTables/DataTablesPage.razor
@@ -6,7 +6,7 @@
 
 <LayoutLargeContentComponent>
     <WebsiteTitleComponent>Data Tables</WebsiteTitleComponent>
-    <MudTabs Elevation="2" >
+    <MudTabs Elevation="2">
         <MudTabPanel Text="Attacks">
             <WeaponTable/>
         </MudTabPanel>
@@ -20,7 +20,7 @@
             <MovementTable/>
         </MudTabPanel>
     </MudTabs>
-    
+
 
     <ContentDividerComponent></ContentDividerComponent>
 
@@ -30,7 +30,9 @@
                 What is this tool?
             </InfoQuestionComponent>
             <InfoAnswerComponent>
-                This tool is a data table of all information belonging to a type of data. Such as viewing all weapons, so one can easily sort and see what weapon attack has the highest range, and what faction and unit that attack belongs to.
+                This tool is a data table of all information belonging to a type of data. Such as viewing all weapons,
+                so one can easily sort and see what weapon attack has the highest range, and what faction and unit that
+                attack belongs to.
             </InfoAnswerComponent>
         </InfoBodyComponent>
 
diff --git a/IGP/Pages/DataTables/Parts/MovementTable.razor b/IGP/Pages/DataTables/Parts/MovementTable.razor
index 7268247..1eb5b5c 100644
--- a/IGP/Pages/DataTables/Parts/MovementTable.razor
+++ b/IGP/Pages/DataTables/Parts/MovementTable.razor
@@ -1,19 +1,21 @@
-<MudDataGrid T="EntityMovementModel" Items="@_data" 
-             SortMode="SortMode.Multiple" 
+<MudDataGrid T="EntityMovementModel" Items="@_data"
+             SortMode="SortMode.Multiple"
              Filterable="true"
              Hideable="true">
     <Columns>
         <PropertyColumn Property="x => x.Parent.GetName()" Title="Entity"/>
         <PropertyColumn Property="x => x.Movement"/>
-        <PropertyColumn Property="x => x.Speed" />
+        <PropertyColumn Property="x => x.Speed"/>
         <PropertyColumn Property="x => x.Parent.GetFaction()" Title="Faction"/>
         <PropertyColumn Property="x => x.Parent.GetImmortal()" Title="Immortal"/>
     </Columns>
 </MudDataGrid>
 
 @code {
-    IEnumerable<EntityMovementModel> _data = DATA.Get()
+
+    readonly IEnumerable<EntityMovementModel> _data = DATA.Get()
         .SelectMany(e => e.Value.EntityParts)
         .OfType<EntityMovementModel>()
         .ToList();
+
 }
\ No newline at end of file
diff --git a/IGP/Pages/DataTables/Parts/ProductionTable.razor b/IGP/Pages/DataTables/Parts/ProductionTable.razor
index 465e2ab..79b6286 100644
--- a/IGP/Pages/DataTables/Parts/ProductionTable.razor
+++ b/IGP/Pages/DataTables/Parts/ProductionTable.razor
@@ -1,5 +1,5 @@
-<MudDataGrid T="EntityProductionModel" Items="@data" 
-             SortMode="SortMode.Multiple" 
+<MudDataGrid T="EntityProductionModel" Items="@data"
+             SortMode="SortMode.Multiple"
              Filterable="true"
              Hideable="true">
     <Columns>
@@ -18,4 +18,5 @@
         .SelectMany(e => e.Value.EntityParts)
         .OfType<EntityProductionModel>()
         .ToList();
+
 }
\ No newline at end of file
diff --git a/IGP/Pages/DataTables/Parts/VitalityTable.razor b/IGP/Pages/DataTables/Parts/VitalityTable.razor
index b60540a..6c928eb 100644
--- a/IGP/Pages/DataTables/Parts/VitalityTable.razor
+++ b/IGP/Pages/DataTables/Parts/VitalityTable.razor
@@ -1,23 +1,25 @@
-<MudDataGrid T="EntityVitalityModel" Items="@_data" 
-             SortMode="SortMode.Multiple" 
+<MudDataGrid T="EntityVitalityModel" Items="@_data"
+             SortMode="SortMode.Multiple"
              Filterable="true"
              Hideable="true">
     <Columns>
         <PropertyColumn Property="x => x.Parent.GetName()" Title="Entity"/>
         <PropertyColumn Property="x => x.Health"/>
-        <PropertyColumn Property="x => x.Armor" />
-        <PropertyColumn Property="x => x.Defense" />
-        <PropertyColumn Property="x => x.DefenseLayer" />
-        <PropertyColumn Property="x => x.IsStructure" />
-        <PropertyColumn Property="x => x.IsEtheric" />
+        <PropertyColumn Property="x => x.Armor"/>
+        <PropertyColumn Property="x => x.Defense"/>
+        <PropertyColumn Property="x => x.DefenseLayer"/>
+        <PropertyColumn Property="x => x.IsStructure"/>
+        <PropertyColumn Property="x => x.IsEtheric"/>
         <PropertyColumn Property="x => x.Parent.GetFaction()" Title="Faction"/>
         <PropertyColumn Property="x => x.Parent.GetImmortal()" Title="Immortal"/>
     </Columns>
 </MudDataGrid>
 
 @code {
-    IEnumerable<EntityVitalityModel> _data = DATA.Get()
+
+    readonly IEnumerable<EntityVitalityModel> _data = DATA.Get()
         .SelectMany(e => e.Value.EntityParts)
         .OfType<EntityVitalityModel>()
         .ToList();
+
 }
\ No newline at end of file
diff --git a/IGP/Pages/DataTables/Parts/WeaponTable.razor b/IGP/Pages/DataTables/Parts/WeaponTable.razor
index 725ac4c..72f7998 100644
--- a/IGP/Pages/DataTables/Parts/WeaponTable.razor
+++ b/IGP/Pages/DataTables/Parts/WeaponTable.razor
@@ -1,5 +1,5 @@
-<MudDataGrid T="EntityWeaponModel" Items="@_data" 
-             SortMode="SortMode.Multiple" 
+<MudDataGrid T="EntityWeaponModel" Items="@_data"
+             SortMode="SortMode.Multiple"
              Filterable="true"
              Hideable="true">
     <Columns>
@@ -17,13 +17,15 @@
         <PropertyColumn Property="x => x.Parent.GetImmortal()" Title="Immortal"/>
     </Columns>
     <PagerContent>
-        <MudDataGridPager T="EntityWeaponModel" />
+        <MudDataGridPager T="EntityWeaponModel"/>
     </PagerContent>
 </MudDataGrid>
 
 @code {
-    IEnumerable<EntityWeaponModel> _data = DATA.Get()
+
+    readonly IEnumerable<EntityWeaponModel> _data = DATA.Get()
         .SelectMany(e => e.Value.EntityParts)
         .OfType<EntityWeaponModel>()
         .ToList();
+
 }
\ No newline at end of file
diff --git a/IGP/Pages/Database/DatabasePage.razor b/IGP/Pages/Database/DatabasePage.razor
index dddf939..ed7449f 100644
--- a/IGP/Pages/Database/DatabasePage.razor
+++ b/IGP/Pages/Database/DatabasePage.razor
@@ -1,7 +1,6 @@
 @layout PageLayout
 @inherits BasePage
 @page "/database"
-
 @using Model
 @implements IDisposable
 
diff --git a/IGP/Pages/Database/DatabaseSinglePage.razor b/IGP/Pages/Database/DatabaseSinglePage.razor
index 9a80f6e..82c0282 100644
--- a/IGP/Pages/Database/DatabaseSinglePage.razor
+++ b/IGP/Pages/Database/DatabaseSinglePage.razor
@@ -5,7 +5,6 @@
 @page "/database/{text}"
 
 @inject IEntityDisplayService EntityDisplayService
-
 @using Model
 @implements IDisposable
 
diff --git a/IGP/Program.cs b/IGP/Program.cs
index 717ce85..064d573 100644
--- a/IGP/Program.cs
+++ b/IGP/Program.cs
@@ -80,7 +80,6 @@ builder.Services.AddScoped(sp => new HttpClient
 builder.Services.AddMudServices();
 
 
-
 await builder.Build().RunAsync();