diff --git a/Kehyeedra3/Commands/Economy.cs b/Kehyeedra3/Commands/Economy.cs
index 57f2ca1..7ec326b 100644
--- a/Kehyeedra3/Commands/Economy.cs
+++ b/Kehyeedra3/Commands/Economy.cs
@@ -193,7 +193,7 @@ namespace Kehyeedra3.Commands
         public async Task FishCommand()
         {
             ulong time = ulong.Parse(DateTime.Now.ToString("yyyyMMddHHmm"));
-            ulong totalXp = 0;
+            ulong totalXp;
             ulong xp = 0;
             ulong level = 0;
             ulong lvlXp = 0;
@@ -288,7 +288,7 @@ namespace Kehyeedra3.Commands
             
             int rari = SRandom.Next(0, 2001);
             int weigh = SRandom.Next(10, 1501+prestige*500);
-            int tierRoll = SRandom.Next(0, 20*rod+10*prestige+11);
+            int tierRoll = SRandom.Next(0, (20*rod)+(10*prestige)+11);
             int dCatchRoll = SRandom.Next(1, 1000)+prestige*20;
 
             int dcatch = 1;
@@ -355,22 +355,22 @@ namespace Kehyeedra3.Commands
             FishTier ftier;
             if (tierRoll > 60 && rod >= 3)
             {
-                fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T4).ToList();
+                fishTiers = fishes.Where(f => f.Tier == FishTier.T4).ToList();
                 ftier = FishTier.T4;
             }
             else if (tierRoll > 40 && rod >= 2)
             {
-                fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T3).ToList();
+                fishTiers = fishes.Where(f => f.Tier == FishTier.T3).ToList();
                 ftier = FishTier.T3;
             }
             else if (tierRoll > 20 && rod >= 1)
             {
-                fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T2).ToList();
+                fishTiers = fishes.Where(f => f.Tier == FishTier.T2).ToList();
                 ftier = FishTier.T2;
             }
             else
             {
-                fishTiers = fishes.Where(f => (int)f.Tier == (int)FishTier.T1).ToList();
+                fishTiers = fishes.Where(f => f.Tier == FishTier.T1).ToList();
                 ftier = FishTier.T1;
             }
 
@@ -410,14 +410,14 @@ namespace Kehyeedra3.Commands
 
                 if (wRoll == 77 && bSpe)
                 {
-                    List<Fish> possibleFishes = fishes.Where(f => (int)f.Rarity == (int)FishRarity.Unreasonable).ToList();
-                    fish = possibleFishes[SRandom.Next(possibleFishes.Count)];
+                    fishRarities = fishes.Where(f => (int)f.Rarity == (int)FishRarity.Unreasonable).ToList();
                     xp = 7777;
                 }
             }
             else if (rarity > 1700)
             {
                 fishRarities = fishTiers.Where(f => (int)f.Rarity == (int)FishRarity.Uncommon).ToList();
+                
                 switch (ftier)
                 {
                     case FishTier.T1:
@@ -473,36 +473,37 @@ namespace Kehyeedra3.Commands
                             break;
                     }
                 }
-                else
+                
+            }
+            else
+            {
+                fishRarities = fishTiers.Where(f => (int)f.Rarity == (int)FishRarity.Common).ToList();
+                switch (ftier)
                 {
-                    fishRarities = fishTiers.Where(f => (int)f.Rarity == (int)FishRarity.Common).ToList();
-                    switch (ftier)
-                    {
-                        case FishTier.T1:
-                            {
-                                xp = 5;
-                            }
-                            break;
-                        case FishTier.T2:
-                            {
-                                xp = 7;
-                            }
-                            break;
-                        case FishTier.T3:
-                            {
-                                xp = 9;
-                            }
-                            break;
-                        case FishTier.T4:
-                            {
-                                xp = 11;
-                            }
-                            break;
-                    }
+                    case FishTier.T1:
+                        {
+                            xp = 5;
+                        }
+                        break;
+                    case FishTier.T2:
+                        {
+                            xp = 7;
+                        }
+                        break;
+                    case FishTier.T3:
+                        {
+                            xp = 9;
+                        }
+                        break;
+                    case FishTier.T4:
+                        {
+                            xp = 11;
+                        }
+                        break;
                 }
             }
-            fish = fishRarities[SRandom.Next(fishRarities.Count)];
 
+            fish = fishRarities[SRandom.Next(fishRarities.Count)];
 
             FishSize size;