diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 301928371..1696527a0 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -127,6 +127,7 @@ tasks.register("buildAndRunSmokeTestsContainer") {
     dependsOn(tasks.build)
 
     doLast {
+        // build and start smoke test container
         exec {
             workingDir(layout.projectDirectory.dir("docker"))
             commandLine(
diff --git a/server/docker/update-env.sh b/server/docker/update-env.sh
index ce63d63d1..2d4b7e0f2 100755
--- a/server/docker/update-env.sh
+++ b/server/docker/update-env.sh
@@ -24,7 +24,7 @@ if [ true = "$is_debug" ]; then
   echo "SERVER_OPTS='-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'" >> .env
 fi
 
-if [ true = "$is_smoke_test" ]; then # TODO make sure every place this script is called knows about this change!
+if [ true = "$is_smoke_test" ]; then
   # add smoke test variables
   echo "MEDIATOR_RING_BUFFER_SIZE=1024" >> .env
   echo "NOTIFIER_RING_BUFFER_SIZE=1024" >> .env
diff --git a/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java b/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java
index e49b9dda1..35dfdc4dc 100644
--- a/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java
+++ b/server/src/main/java/com/hedera/block/server/config/ServerMappedConfigSourceInitializer.java
@@ -34,6 +34,13 @@ private ServerMappedConfigSourceInitializer() {
         throw new UnsupportedOperationException("Creating instances is not supported!");
     }
 
+    /**
+     * This method constructs, initializes and returns a new instance of {@link MappedConfigSource}
+     * which internally uses {@link SystemEnvironmentConfigSource} and maps relevant config keys to
+     * other keys so that they could be used within the application
+     *
+     * @return newly constructed fully initialized {@link MappedConfigSource}
+     */
     public static MappedConfigSource getMappedConfigSource() {
         final MappedConfigSource config =
                 new MappedConfigSource(SystemEnvironmentConfigSource.getInstance());