diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java
index 367a4e74..7ccc5348 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java
@@ -278,8 +278,7 @@ protected List<Mothership> getMothershipListToRender() {
             for (final Mothership ms : msData.getMotherships().values()) {
                 if ((ms == this.selectedBody || ms.getParent() == this.selectedBody && this.selectionCount != 1)
                         && (this.ticksSinceSelection > 35 || this.selectedBody == ms
-                                || this.lastSelectedBody instanceof Mothership ship
-                                        && ship.getParent().equals(ms))
+                                || this.lastSelectedBody instanceof Mothership ship && ship.getParent().equals(ms))
                         || this.isSiblingOf(this.selectedBody, ms)) {
                     result.add(ms);
                 }
diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java
index 21a8e23b..be7a6913 100755
--- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java
+++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java
@@ -209,7 +209,8 @@ public List<Mothership> getMothershipsForParent(final CelestialBody parent) {
         if (parent == null) {
             return new ArrayList<>(0);
         }
-        return this.mothershipIdList.values().stream().filter(ship -> parent.equals(ship.getParent())).collect(Collectors.toList());
+        return this.mothershipIdList.values().stream().filter(ship -> parent.equals(ship.getParent()))
+                .collect(Collectors.toList());
     }
 
     /**
@@ -255,7 +256,8 @@ public Mothership getByMothershipId(final int id) {
     }
 
     public Mothership getByName(final String name) {
-        return this.mothershipIdList.values().stream().filter(ship -> ship.getName().equals(name)).findFirst().orElse(null);
+        return this.mothershipIdList.values().stream().filter(ship -> ship.getName().equals(name)).findFirst()
+                .orElse(null);
     }
 
     @Override
diff --git a/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java
index 183d1386..8eef8742 100755
--- a/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java
@@ -1,14 +1,14 @@
 package de.katzenpapst.amunra.world;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import micdoodle8.mods.galacticraft.api.prefab.world.gen.ChunkProviderSpace;
 import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta;
 import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper;
@@ -21,10 +21,12 @@ abstract public class AmunraChunkProvider extends ChunkProviderSpace {
     public static final int CHUNK_SIZE_X = 16;
     public static final int CHUNK_SIZE_Y = 256;
     public static final int CHUNK_SIZE_Z = 16;
-    
-    protected BiomeGenBase[] biomes = {BiomeGenBaseOrbit.space};
+
+    protected BiomeGenBase[] biomes = { BiomeGenBaseOrbit.space };
     protected SpawnListEntry[] creatures = {};
-    protected SpawnListEntry[] monsters = {new SpawnListEntry(EntityEvolvedSkeleton.class, 100, 4, 4), new SpawnListEntry(EntityEvolvedCreeper.class, 100, 4, 4), new SpawnListEntry(EntityEvolvedZombie.class, 100, 4, 4)};
+    protected SpawnListEntry[] monsters = { new SpawnListEntry(EntityEvolvedSkeleton.class, 100, 4, 4),
+            new SpawnListEntry(EntityEvolvedCreeper.class, 100, 4, 4),
+            new SpawnListEntry(EntityEvolvedZombie.class, 100, 4, 4) };
     protected final List<MapGenBaseMeta> worldGenerators = new ArrayList<>();
 
     public AmunraChunkProvider(final World world, final long seed, final boolean mapFeaturesEnabled) {
@@ -36,7 +38,7 @@ public int getCraterProbability() {
         // vestigial
         return 2000;
     }
-    
+
     @Override
     protected BiomeGenBase[] getBiomesForGeneration() {
         return this.biomes;
@@ -46,12 +48,12 @@ protected BiomeGenBase[] getBiomesForGeneration() {
     protected SpawnListEntry[] getCreatures() {
         return this.creatures;
     }
-    
+
     @Override
     protected SpawnListEntry[] getMonsters() {
         return this.monsters;
     }
-    
+
     @Override
     protected List<MapGenBaseMeta> getWorldGenerators() {
         return this.worldGenerators;
diff --git a/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java
index 998d2973..7aa4dcde 100755
--- a/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java
@@ -37,7 +37,7 @@ public HorusChunkProvider(final World world, final long seed, final boolean mapF
                 this.stoneBlock,
                 15,
                 true);
-        
+
         this.worldGenerators.add(this.volcanoGen);
         this.worldGenerators.add(this.pyramid);
     }
diff --git a/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java
index 79ad2d3d..bb16545c 100755
--- a/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java
@@ -14,8 +14,8 @@ public class MaahesChunkProvider extends AmunraChunkProvider {
 
     public MaahesChunkProvider(final World world, final long seed, final boolean mapFeaturesEnabled) {
         super(world, seed, mapFeaturesEnabled);
-        this.creatures = new SpawnListEntry[] {new SpawnListEntry(EntityPorcodon.class, 50, 4, 10)};
-        this.monsters = new SpawnListEntry[] {new SpawnListEntry(EntityAlienBug.class, 100, 4, 4)};
+        this.creatures = new SpawnListEntry[] { new SpawnListEntry(EntityPorcodon.class, 50, 4, 10) };
+        this.monsters = new SpawnListEntry[] { new SpawnListEntry(EntityAlienBug.class, 100, 4, 4) };
     }
 
     @Override
diff --git a/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java
index d00f48f6..78f714ba 100755
--- a/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java
@@ -64,7 +64,7 @@ public SethChunkProvider(final World world, final long seed, final boolean mapFe
         this.volcanoGen = new VolcanoGenerator(this.waterBlock, this.rockBlock, this.dirtBlock, 60, false);
 
         this.crystalGen = new CrystalFormation(ARBlocks.blockGlowingCoral, this.waterBlock);
-        
+
         this.monsters = new SpawnListEntry[] {};
         this.biomes = new BiomeGenBase[] { BiomeGenBase.iceMountains };
         this.worldGenerators.add(this.volcanoGen);