diff --git a/src/main/java/net/server/channel/handlers/SnowballHandler.java b/src/main/java/net/server/channel/handlers/SnowballHandler.java
index 987ce57059..cfec0e437b 100644
--- a/src/main/java/net/server/channel/handlers/SnowballHandler.java
+++ b/src/main/java/net/server/channel/handlers/SnowballHandler.java
@@ -25,7 +25,7 @@ import client.Character;
 import client.Client;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
-import server.events.gm.MapleSnowball;
+import server.events.gm.Snowball;
 import server.maps.MapleMap;
 
 /**
@@ -38,8 +38,8 @@ public final class SnowballHandler extends AbstractPacketHandler {
         //D3 00 02 00 00 A5 01
         Character chr = c.getPlayer();
         MapleMap map = chr.getMap();
-        final MapleSnowball snowball = map.getSnowball(chr.getTeam());
-        final MapleSnowball othersnowball = map.getSnowball(chr.getTeam() == 0 ? (byte) 1 : 0);
+        final Snowball snowball = map.getSnowball(chr.getTeam());
+        final Snowball othersnowball = map.getSnowball(chr.getTeam() == 0 ? (byte) 1 : 0);
         int what = p.readByte();
         //slea.skip(4);
 
diff --git a/src/main/java/server/events/gm/MapleSnowball.java b/src/main/java/server/events/gm/Snowball.java
similarity index 77%
rename from src/main/java/server/events/gm/MapleSnowball.java
rename to src/main/java/server/events/gm/Snowball.java
index 1334a92d78..22a1249306 100644
--- a/src/main/java/server/events/gm/MapleSnowball.java
+++ b/src/main/java/server/events/gm/Snowball.java
@@ -30,31 +30,33 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- *
  * @author kevintjuh93
  */
-public class MapleSnowball {
-    private MapleMap map;
+public class Snowball {
+    private final MapleMap map;
     private int position = 0;
     private int hits = 3;
     private int snowmanhp = 1000;
     private boolean hittable = false;
-    private int team;
+    private final int team;
     private boolean winner = false;
     List<Character> characters = new LinkedList<>();
 
-    public MapleSnowball(int team, MapleMap map) {
+    public Snowball(int team, MapleMap map) {
         this.map = map;
         this.team = team;
 
         for (Character chr : map.getCharacters()) {
-            if (chr.getTeam() == team)
+            if (chr.getTeam() == team) {
                 characters.add(chr);
+            }
         }
     }
 
     public void startEvent() {
-        if (hittable == true) return;
+        if (hittable == true) {
+            return;
+        }
 
         for (Character chr : characters) {
             if (chr != null) {
@@ -66,14 +68,16 @@ public class MapleSnowball {
         TimerManager.getInstance().schedule(() -> {
             if (map.getSnowball(team).getPosition() > map.getSnowball(team == 0 ? 1 : 0).getPosition()) {
                 for (Character chr : characters) {
-                    if (chr != null)
+                    if (chr != null) {
                         chr.sendPacket(PacketCreator.rollSnowBall(false, 3, map.getSnowball(0), map.getSnowball(0)));
+                    }
                 }
                 winner = true;
             } else if (map.getSnowball(team == 0 ? 1 : 0).getPosition() > map.getSnowball(team).getPosition()) {
                 for (Character chr : characters) {
-                    if (chr != null)
+                    if (chr != null) {
                         chr.sendPacket(PacketCreator.rollSnowBall(false, 4, map.getSnowball(0), map.getSnowball(0)));
+                    }
                 }
                 winner = true;
             } //Else
@@ -81,7 +85,7 @@ public class MapleSnowball {
         }, 600000);
 
     }
-    
+
     public boolean isHittable() {
         return hittable;
     }
@@ -103,31 +107,34 @@ public class MapleSnowball {
     }
 
     public void hit(int what, int damage) {
-        if (what < 2)
-            if (damage > 0)
+        if (what < 2) {
+            if (damage > 0) {
                 this.hits--;
-        else {
-            if (this.snowmanhp - damage < 0) {
-                this.snowmanhp = 0;
+            } else {
+                if (this.snowmanhp - damage < 0) {
+                    this.snowmanhp = 0;
 
-                TimerManager.getInstance().schedule(() -> {
-                    setSnowmanHP(7500);
-                    message(5);
-                }, 10000);
-            } else
-                this.snowmanhp -= damage;
-        map.broadcastMessage(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
+                    TimerManager.getInstance().schedule(() -> {
+                        setSnowmanHP(7500);
+                        message(5);
+                    }, 10000);
+                } else {
+                    this.snowmanhp -= damage;
+                }
+                map.broadcastMessage(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
+            }
         }
 
         if (this.hits == 0) {
             this.position += 1;
-            if (this.position == 45)
+            if (this.position == 45) {
                 map.getSnowball(team == 0 ? 1 : 0).message(1);
-            else if (this.position == 290)
+            } else if (this.position == 290) {
                 map.getSnowball(team == 0 ? 1 : 0).message(2);
-            else if (this.position == 560)
+            } else if (this.position == 560) {
                 map.getSnowball(team == 0 ? 1 : 0).message(3);
-                
+            }
+
             this.hits = 3;
             map.broadcastMessage(PacketCreator.rollSnowBall(false, 0, map.getSnowball(0), map.getSnowball(1)));
             map.broadcastMessage(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
@@ -137,17 +144,19 @@ public class MapleSnowball {
 
     public void message(int message) {
         for (Character chr : characters) {
-            if (chr != null)
+            if (chr != null) {
                 chr.sendPacket(PacketCreator.snowballMessage(team, message));
+            }
         }
     }
 
     public void warpOut() {
         TimerManager.getInstance().schedule(() -> {
-            if (winner == true)
+            if (winner == true) {
                 map.warpOutByTeam(team, 109050000);
-            else
+            } else {
                 map.warpOutByTeam(team, 109050001);
+            }
 
             map.setSnowball(team, null);
         }, 10000);
diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java
index 4ab1c20cb6..2a8213efdb 100644
--- a/src/main/java/server/maps/MapleMap.java
+++ b/src/main/java/server/maps/MapleMap.java
@@ -144,8 +144,8 @@ public class MapleMap {
     
     // events
     private boolean eventstarted = false, isMuted = false;
-    private MapleSnowball snowball0 = null;
-    private MapleSnowball snowball1 = null;
+    private Snowball snowball0 = null;
+    private Snowball snowball1 = null;
     private Coconut coconut;
     
     //CPQ
@@ -3842,7 +3842,7 @@ public class MapleMap {
     }
 
     // BEGIN EVENTS
-    public void setSnowball(int team, MapleSnowball ball) {
+    public void setSnowball(int team, Snowball ball) {
         switch (team) {
             case 0:
                 this.snowball0 = ball;
@@ -3855,7 +3855,7 @@ public class MapleMap {
         }
     }
 
-    public MapleSnowball getSnowball(int team) {
+    public Snowball getSnowball(int team) {
         switch (team) {
             case 0:
                 return snowball0;
@@ -3904,8 +3904,8 @@ public class MapleMap {
             getOx().sendQuestion();
             setOxQuiz(true);
         } else if (this.mapid == 109060000 && getSnowball(chr.getTeam()) == null) {
-            setSnowball(0, new MapleSnowball(0, this));
-            setSnowball(1, new MapleSnowball(1, this));
+            setSnowball(0, new Snowball(0, this));
+            setSnowball(1, new Snowball(1, this));
             getSnowball(chr.getTeam()).startEvent();
         }
     }
diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java
index 8b26ae71ce..1ddac131c5 100644
--- a/src/main/java/tools/PacketCreator.java
+++ b/src/main/java/tools/PacketCreator.java
@@ -60,7 +60,7 @@ import server.CashShop.CashItem;
 import server.CashShop.CashItemFactory;
 import server.CashShop.SpecialCashItem;
 import server.*;
-import server.events.gm.MapleSnowball;
+import server.events.gm.Snowball;
 import server.life.MapleMonster;
 import server.life.MapleNPC;
 import server.life.MaplePlayerNPC;
@@ -6792,7 +6792,7 @@ public class PacketCreator {
         return OutPacket.create(SendOpcode.LEFT_KNOCK_BACK);
     }
 
-    public static Packet rollSnowBall(boolean entermap, int state, MapleSnowball ball0, MapleSnowball ball1) {
+    public static Packet rollSnowBall(boolean entermap, int state, Snowball ball0, Snowball ball1) {
         OutPacket p = OutPacket.create(SendOpcode.SNOWBALL_STATE);
         if (entermap) {
             p.skip(21);