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 05044478..367a4e74 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java
@@ -270,7 +270,7 @@ protected boolean isSiblingOf(final CelestialBody celestialBody, final Mothershi
     }
 
     protected List<Mothership> getMothershipListToRender() {
-        final LinkedList<Mothership> result = new LinkedList<>();
+        final List<Mothership> result = new LinkedList<>();
 
         if (this.selectedBody != null) {
             final MothershipWorldData msData = TickHandlerServer.mothershipData;
@@ -278,8 +278,8 @@ 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
-                                        && ((Mothership) this.lastSelectedBody).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/client/gui/GuiShuttleSelection.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java
index 2682ed20..2b4e8eba 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java
@@ -37,11 +37,11 @@ public GuiShuttleSelection(final MapMode mapMode, final List<CelestialBody> poss
     }
 
     protected CelestialBody getParent(final CelestialBody body) {
-        if (body instanceof IChildBody) {// satellite apparently implements this already?
-            return ((IChildBody) body).getParentPlanet();
+        if (body instanceof IChildBody child) {// satellite apparently implements this already?
+            return child.getParentPlanet();
         }
-        if (body instanceof Mothership) {
-            return ((Mothership) body).getParent();
+        if (body instanceof Mothership ship) {
+            return ship.getParent();
         }
         return body;
     }
diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java
index 1cb693f2..2aefcaaf 100755
--- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java
@@ -55,10 +55,7 @@ public Chunk provideChunk(int p_73154_1_, int p_73154_2_) {
 
         final Chunk chunk = new Chunk(this.worldObjNonPrivate, ids, meta, p_73154_1_, p_73154_2_);
 
-        final byte[] biomesArray = chunk.getBiomeArray();
-        for (int i = 0; i < biomesArray.length; ++i) {
-            biomesArray[i] = (byte) BiomeGenBaseOrbit.space.biomeID;
-        }
+        Arrays.fill(chunk.getBiomeArray(), (byte) BiomeGenBaseOrbit.space.biomeID);
 
         chunk.generateSkylightMap();
         return chunk;
diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java
index e8576529..21a8e23b 100755
--- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java
+++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java
@@ -255,7 +255,7 @@ public Mothership getByMothershipId(final int id) {
     }
 
     public Mothership getByName(final String name) {
-        return this.mothershipIdList.values().stream().filter(t -> t.getName().equals(name)).findFirst().orElse(null);
+        return this.mothershipIdList.values().stream().filter(ship -> ship.getName().equals(name)).findFirst().orElse(null);
     }
 
     @Override