diff --git a/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java b/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java
index 656ee0e..2e1c090 100644
--- a/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java
+++ b/src/main/java/world/bentobox/caveblock/generators/ChunkGeneratorWorld.java
@@ -25,6 +25,10 @@ import java.util.Random;
  */
 public class ChunkGeneratorWorld extends ChunkGenerator
 {
+    // ---------------------------------------------------------------------
+    // Section: Variables
+    // ---------------------------------------------------------------------
+
     private final CaveBlock addon;
     private final Settings settings;
     private final List<BlockPopulator> blockPopulators;
diff --git a/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java b/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java
index 3d71e4e..077b7d5 100644
--- a/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java
+++ b/src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java
@@ -24,6 +24,10 @@ import java.util.stream.Collectors;
  */
 public class EntitiesPopulator extends BlockPopulator {
 
+    // ---------------------------------------------------------------------
+    // Section: Variables
+    // ---------------------------------------------------------------------
+
     /**
      * Water entities
      */
@@ -48,6 +52,10 @@ public class EntitiesPopulator extends BlockPopulator {
      */
     private int worldHeight;
 
+    // ---------------------------------------------------------------------
+    // Section: Constructor
+    // ---------------------------------------------------------------------
+
     /**
      * This is default constructor
      *
@@ -58,9 +66,8 @@ public class EntitiesPopulator extends BlockPopulator {
         this.loadSettings();
     }
 
-
     // ---------------------------------------------------------------------
-    // Section: Private Classes
+    // Section: Methods
     // ---------------------------------------------------------------------
 
     /**
@@ -79,11 +86,6 @@ public class EntitiesPopulator extends BlockPopulator {
         worldHeight = addon.getSettings().getWorldDepth();
     }
 
-
-    // ---------------------------------------------------------------------
-    // Section: Variables
-    // ---------------------------------------------------------------------
-
     /**
      * This method populates chunk with entities.
      *
@@ -183,6 +185,10 @@ public class EntitiesPopulator extends BlockPopulator {
         }
     }
 
+    // ---------------------------------------------------------------------
+    // Section: Private Classes
+    // ---------------------------------------------------------------------
+
     /**
      * Chances class to store chances for environments and main material
      *
diff --git a/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java b/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java
index 3e0708d..31a7531 100644
--- a/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java
+++ b/src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java
@@ -20,6 +20,10 @@ import java.util.Random;
  */
 public class MaterialPopulator extends BlockPopulator {
 
+    // ---------------------------------------------------------------------
+    // Section: Variables
+    // ---------------------------------------------------------------------
+
     /**
      * CaveBlock addon.
      */
@@ -33,6 +37,10 @@ public class MaterialPopulator extends BlockPopulator {
      */
     private int worldHeight;
 
+    // ---------------------------------------------------------------------
+    // Section: Constructor
+    // ---------------------------------------------------------------------
+
     /**
      * This is default constructor
      *
@@ -44,9 +52,8 @@ public class MaterialPopulator extends BlockPopulator {
         this.loadSettings();
     }
 
-
     // ---------------------------------------------------------------------
-    // Section: Private Classes
+    // Section: Methods
     // ---------------------------------------------------------------------
 
     /**
@@ -65,11 +72,6 @@ public class MaterialPopulator extends BlockPopulator {
         worldHeight = addon.getSettings().getWorldDepth();
     }
 
-
-    // ---------------------------------------------------------------------
-    // Section: Variables
-    // ---------------------------------------------------------------------
-
     /**
      * This method populates chunk with blocks.
      *
@@ -160,6 +162,10 @@ public class MaterialPopulator extends BlockPopulator {
         return materialMap;
     }
 
+    // ---------------------------------------------------------------------
+    // Section: Private Classes
+    // ---------------------------------------------------------------------
+
     /**
      * Chances class to store chances for environments and main material
      *