diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java
index ca126d288..79ba49ce5 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java
@@ -682,7 +682,6 @@ public class FullDataSourceV2
 	 */
 	private static byte determineMinWorldGenStepForTwoByTwoColumn(ByteArrayList columnGenerationSteps, int relX, int relZ)
 	{
-		// TODO merge similar logic with determineHighestWorldCompressionForTwoByTwoColumn
 		byte minWorldGenStepValue = Byte.MAX_VALUE;
 		for (int x = 0; x < 2; x++)
 		{
@@ -701,7 +700,6 @@ public class FullDataSourceV2
 	 */
 	private static byte determineHighestWorldCompressionForTwoByTwoColumn(ByteArrayList columnCompressionMode, int relX, int relZ)
 	{
-		// TODO merge similar logic with determineMinWorldGenStepForTwoByTwoColumn
 		byte minWorldGenStepValue = Byte.MIN_VALUE;
 		for (int x = 0; x < 2; x++)
 		{
@@ -777,7 +775,7 @@ public class FullDataSourceV2
 			return newColumnList;
 		}
 		
-		// sort the transitions from bottom to top // TODO
+		// sort the transitions from bottom to top
 		yTransitions.sort(null);
 		
 		// create index trackers for each column, 
@@ -1316,7 +1314,6 @@ public class FullDataSourceV2
 			
 			LongArrayList packedDataPoints = LodDataBuilder.convertApiDataPointListToPackedLongArray(columnDataPoints, this, 0, true);
 			
-			// TODO there should be an "unknown" compression and generation step, or be defined via the datapoints
 			this.setSingleColumn(packedDataPoints, relX, relZ, EDhApiWorldGenerationStep.SURFACE, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
 			
 			return columnDataPoints;
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java
index 0fb5eaa28..ce62adcab 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java
@@ -46,6 +46,11 @@ public class DhApplyShader extends AbstractShaderRenderer
 	
 	
 	
+	//=======//
+ 	// setup //
+ 	//=======//
+	//region
+	
 	private DhApplyShader() { }
 	
 	@Override
@@ -66,10 +71,14 @@ public class DhApplyShader extends AbstractShaderRenderer
 	@Override
 	protected void onApplyUniforms(float partialTicks) { }
 	
+	//endregion
+	
+	
 	
 	//========//
 	// render //
 	//========//
+	//region
 	
 	@Override
 	protected void onRender()
@@ -83,7 +92,6 @@ public class DhApplyShader extends AbstractShaderRenderer
 			this.renderToMcTexture();
 		}
 	}
-	// TODO merge duplicate code between these to render methods
 	private void renderToFrameBuffer()
 	{
 		int targetFrameBuffer = MC_RENDER.getTargetFramebuffer();
@@ -186,6 +194,8 @@ public class DhApplyShader extends AbstractShaderRenderer
 		
 	}
 	
+	//endregion
+	
 	
 	
 }
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java
index ebb220798..f453136d6 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/repo/FullDataSourceV2Repo.java
@@ -760,7 +760,7 @@ public class FullDataSourceV2Repo extends AbstractDhRepo<Long, FullDataSourceV2D
 			statement.setInt(i++, DhSectionPos.getZ(pos));
 			
 			
-			try (ResultSet result = this.query(statement)) // TODO check other query's
+			try (ResultSet result = this.query(statement))
 			{
 				if (result == null || !result.next())
 				{