diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java b/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java
index 90d46fa64..10d9ece76 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java
+++ b/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java
@@ -267,7 +267,7 @@ public enum EntityMetaDataFields {
 
     THROWN_EYE_OF_ENDER_ITEM;
 
-    final Object defaultValue;
+    private final Object defaultValue;
 
     EntityMetaDataFields() {
         defaultValue = null;
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java
index 580469970..a72b9a821 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java
@@ -226,9 +226,10 @@ public abstract class Entity {
     }
 
     @EntityMetaDataFunction(identifier = "ticksFrozen")
-    public int getTicksFrozen(){
+    public int getTicksFrozen() {
         return metaData.getSets().getInt(EntityMetaDataFields.ENTITY_TICKS_FROZEN);
     }
+
     @Override
     public String toString() {
         return String.format("%s:%s", information.getMod(), information.getIdentifier());
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingHook.java b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingHook.java
index a66c82c29..bb61f1717 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingHook.java
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/projectile/FishingHook.java
@@ -23,9 +23,9 @@ import java.util.UUID;
 
 public class FishingHook extends Projectile {
 
-     public FishingHook(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) {
-         super(connection, entityId, uuid, location, rotation);
-     }
+    public FishingHook(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) {
+        super(connection, entityId, uuid, location, rotation);
+    }
 
     @EntityMetaDataFunction(identifier = "hookedEntityId")
     public int getHookedEntityId() {
diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockProperties.java b/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockProperties.java
index b2164833a..1a0eafc35 100644
--- a/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockProperties.java
+++ b/src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockProperties.java
@@ -430,7 +430,8 @@ public enum BlockProperties {
             PROPERTIES_MAPPING.get(property.getGroup()).put(property.getValue(), property);
         }
     }
-final String group;
+
+    final String group;
     final String value;
 
     BlockProperties() {
diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/particle/Particle.java b/src/main/java/de/bixilon/minosoft/data/mappings/particle/Particle.java
index 2e52e47a4..76d2f3739 100644
--- a/src/main/java/de/bixilon/minosoft/data/mappings/particle/Particle.java
+++ b/src/main/java/de/bixilon/minosoft/data/mappings/particle/Particle.java
@@ -16,7 +16,7 @@ package de.bixilon.minosoft.data.mappings.particle;
 import de.bixilon.minosoft.data.mappings.ModIdentifier;
 
 public class Particle extends ModIdentifier {
-    
+
     public Particle(String mod, String identifier) {
         super(mod, identifier);
     }
diff --git a/src/main/java/de/bixilon/minosoft/logging/Log.java b/src/main/java/de/bixilon/minosoft/logging/Log.java
index 792ea1f4f..bdcaf7cf6 100644
--- a/src/main/java/de/bixilon/minosoft/logging/Log.java
+++ b/src/main/java/de/bixilon/minosoft/logging/Log.java
@@ -22,9 +22,9 @@ import java.text.SimpleDateFormat;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public class Log {
+    public final static long MINOSOFT_START_TIME = System.currentTimeMillis();
     final static SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
     final static LinkedBlockingQueue<String> queue = new LinkedBlockingQueue<>();
-    public final static long MINOSOFT_START_TIME = System.currentTimeMillis();
     static LogLevels level = LogLevels.PROTOCOL;
 
     static {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java
index 607d3ddbb..84e8596ee 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java
@@ -74,7 +74,7 @@ public class PacketMapData implements ClientboundPacket {
         if (buffer.getVersionId() >= 452) {
             locked = buffer.readBoolean();
         }
-int pinCount = 0;
+        int pinCount = 0;
         if (buffer.getVersionId() < 759) {
             pinCount = buffer.readVarInt();
         } else {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.java
index 0ed8f00cf..2d648d7cd 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.java
@@ -146,8 +146,7 @@ public class OutByteBuffer {
 
     public void writeVarInt(int value) {
         // thanks https://wiki.vg/Protocol#VarInt_and_VarLong
-        do
-        {
+        do {
             byte temp = (byte) (value & 0x7F);
             value >>>= 7;
             if (value != 0) {
@@ -160,8 +159,7 @@ public class OutByteBuffer {
     public void prefixVarInt(int value) {
         int count = 0;
         // thanks https://wiki.vg/Protocol#VarInt_and_VarLong
-        do
-        {
+        do {
             byte temp = (byte) (value & 0x7F);
             value >>>= 7;
             if (value != 0) {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
index e760f45b1..59a743cc6 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
@@ -294,7 +294,7 @@ public class PacketHandler {
 
     public void handle(PacketEntityMovementAndRotation pkg) {
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -304,7 +304,7 @@ public class PacketHandler {
 
     public void handle(PacketEntityMovement pkg) {
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -313,11 +313,11 @@ public class PacketHandler {
 
     public void handle(PacketEntityRotation pkg) {
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
-       entity.setRotation(pkg.getYaw(), pkg.getPitch());
+        entity.setRotation(pkg.getYaw(), pkg.getPitch());
     }
 
     public void handle(PacketDestroyEntity pkg) {
@@ -336,7 +336,7 @@ public class PacketHandler {
         } else {
             entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
         }
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -352,7 +352,7 @@ public class PacketHandler {
 
     public void handle(PacketEntityTeleport pkg) {
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -362,7 +362,7 @@ public class PacketHandler {
 
     public void handle(PacketEntityHeadRotation pkg) {
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -376,8 +376,8 @@ public class PacketHandler {
     }
 
     public void handle(PacketEntityMetadata pkg) {
-        Entity entity= connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -388,7 +388,7 @@ public class PacketHandler {
         connection.fireEvent(new EntityEquipmentChangeEvent(connection, pkg));
 
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -397,7 +397,7 @@ public class PacketHandler {
 
     public void handle(PacketBlockChange pkg) {
         Chunk chunk = connection.getPlayer().getWorld().getChunk(pkg.getPosition().getChunkLocation());
-        if(chunk == null){
+        if (chunk == null) {
             // thanks mojang
             return;
         }
@@ -462,8 +462,8 @@ public class PacketHandler {
     }
 
     public void handle(PacketEntityEffect pkg) {
-        Entity entity= connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -472,7 +472,7 @@ public class PacketHandler {
 
     public void handle(PacketRemoveEntityEffect pkg) {
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }
@@ -510,7 +510,7 @@ public class PacketHandler {
 
     public void handle(PacketAttachEntity pkg) {
         Entity entity = connection.getPlayer().getWorld().getEntity(pkg.getEntityId());
-        if(entity == null){
+        if (entity == null) {
             // thanks mojang
             return;
         }