diff --git a/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/ExponentialMovingAverage.java b/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/ExponentialMovingAverage.java
index c2ec316ddb..d183e689c4 100644
--- a/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/ExponentialMovingAverage.java
+++ b/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/ExponentialMovingAverage.java
@@ -15,10 +15,8 @@ public class ExponentialMovingAverage {
 
     public double calculateEMA(double newValue) {
         if (previousEMA == null) {
-            // First data point, EMA is same as the value itself
             previousEMA = newValue;
         } else {
-            // Calculate EMA using the formula: EMA = alpha * newValue + (1 - alpha) * previousEMA
             previousEMA = alpha * newValue + (1 - alpha) * previousEMA;
         }
         return previousEMA;
diff --git a/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/MovingAverageByCircularBuffer.java b/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/MovingAverageByCircularBuffer.java
index 286d2cf62e..5136e1e38d 100644
--- a/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/MovingAverageByCircularBuffer.java
+++ b/core-java-modules/core-java-calculating-moving-averages/src/main/java/com/baeldung/MovingAverageByCircularBuffer.java
@@ -24,7 +24,7 @@ public class MovingAverageByCircularBuffer {
         }
         double sum = 0;
         for (int i = 0; i < count; i++) {
-            sum += buffer[i]; //buffer[(head + i) % buffer.length];
+            sum += buffer[i];
         }
         return sum / count;
     }
diff --git a/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/ExponentialMovingAverageUnitTest.java b/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/ExponentialMovingAverageUnitTest.java
index 2569295547..9db186662d 100644
--- a/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/ExponentialMovingAverageUnitTest.java
+++ b/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/ExponentialMovingAverageUnitTest.java
@@ -5,19 +5,20 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 public class ExponentialMovingAverageUnitTest {
+
     @Test(expected = IllegalArgumentException.class)
-    public void when_alpha_is_invalid_should_throw_exception() {
-        new ExponentialMovingAverage(0); // Alpha outside valid range
+    public void whenAlphaIsInvalid_shouldThrowException() {
+        new ExponentialMovingAverage(0);
     }
 
     @Test
-    public void when_first_value_is_added_EMA_should_be_same_as_value() {
+    public void whenFirstValueIsAdded_shouldHaveExponentialMovingAverageSameAsValue() {
         ExponentialMovingAverage ema = new ExponentialMovingAverage(0.5);
         assertEquals(10.0, ema.calculateEMA(10.0), 0.001);
     }
 
     @Test
-    public void when_values_are_added_EMA_should_update_correctly() {
+    public void whenValuesAreAdded_shouldUpdateExponentialMovingAverageCorrectly() {
         ExponentialMovingAverage ema = new ExponentialMovingAverage(0.4);
         assertEquals(10.0, ema.calculateEMA(10.0), 0.001);
         assertEquals(14.0, ema.calculateEMA(20.0), 0.001);
@@ -25,14 +26,14 @@ public class ExponentialMovingAverageUnitTest {
     }
 
     @Test
-    public void when_alpha_is_closer_to_one_EMA_should_respond_faster_to_changes() {
+    public void whenAlphaIsCloserToOne_exponentialMovingAverageShouldRespondFasterToChanges() {
         ExponentialMovingAverage ema1 = new ExponentialMovingAverage(0.2);
         ExponentialMovingAverage ema2 = new ExponentialMovingAverage(0.8);
 
         assertEquals(10.0, ema1.calculateEMA(10.0), 0.001);
         assertEquals(10.0, ema2.calculateEMA(10.0), 0.001);
 
-        assertEquals(12.0, ema1.calculateEMA(20.0), 0.001); // Responds slower
-        assertEquals(18.0, ema2.calculateEMA(20.0), 0.001); // Responds faster
+        assertEquals(12.0, ema1.calculateEMA(20.0), 0.001);
+        assertEquals(18.0, ema2.calculateEMA(20.0), 0.001);
     }
 }
diff --git a/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageByCircularBufferUnitTest.java b/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageByCircularBufferUnitTest.java
index ff4e31cb75..2e213adbbb 100644
--- a/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageByCircularBufferUnitTest.java
+++ b/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageByCircularBufferUnitTest.java
@@ -6,30 +6,30 @@ import static org.junit.Assert.assertEquals;
 
 public class MovingAverageByCircularBufferUnitTest {
 
-@Test
-public void when_initial_average_is_calculated_it_should_be_zero() {
-    MovingAverageByCircularBuffer ma = new MovingAverageByCircularBuffer(5);
-    assertEquals(Double.NaN, ma.getMovingAverage(), 0.001); // Empty buffer
-}
+    @Test
+    public void whenInitialAverageIsCalculated_shouldReturnNAN() {
+        MovingAverageByCircularBuffer ma = new MovingAverageByCircularBuffer(5);
+        assertEquals(Double.NaN, ma.getMovingAverage(), 0.001);
+    }
 
-@Test
-public void when_values_are_added_average_should_update_correctly() {
-    MovingAverageByCircularBuffer ma = new MovingAverageByCircularBuffer(3);
-    ma.add(10);
-    assertEquals(10.0, ma.getMovingAverage(), 0.001);
-    ma.add(20);
-    assertEquals(15.0, ma.getMovingAverage(), 0.001);
-    ma.add(30);
-    assertEquals(20.0, ma.getMovingAverage(), 0.001);
-}
+    @Test
+    public void whenValuesAreAdded_shouldUpdateAverageCorrectly() {
+        MovingAverageByCircularBuffer ma = new MovingAverageByCircularBuffer(3);
+        ma.add(10);
+        assertEquals(10.0, ma.getMovingAverage(), 0.001);
+        ma.add(20);
+        assertEquals(15.0, ma.getMovingAverage(), 0.001);
+        ma.add(30);
+        assertEquals(20.0, ma.getMovingAverage(), 0.001);
+    }
 
-@Test
-public void when_window_size_is_full_oldest_value_should_be_overwritten() {
-    MovingAverageByCircularBuffer ma = new MovingAverageByCircularBuffer(2);
-    ma.add(10);
-    ma.add(20);
-    assertEquals(15.0, ma.getMovingAverage(), 0.001);
-    ma.add(30); // Overwrites 10
-    assertEquals(25.0, ma.getMovingAverage(), 0.001);
-}
+    @Test
+    public void whenWindowSizeIsFull_shouldOverrideTheOldestValue() {
+        MovingAverageByCircularBuffer ma = new MovingAverageByCircularBuffer(2);
+        ma.add(10);
+        ma.add(20);
+        assertEquals(15.0, ma.getMovingAverage(), 0.001);
+        ma.add(30);
+        assertEquals(25.0, ma.getMovingAverage(), 0.001);
+    }
 }
diff --git a/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageWithApacheCommonsMathUnitTest.java b/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageWithApacheCommonsMathUnitTest.java
index 3b96761c98..d2212a59d2 100644
--- a/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageWithApacheCommonsMathUnitTest.java
+++ b/core-java-modules/core-java-calculating-moving-averages/src/test/java/com/baeldung/MovingAverageWithApacheCommonsMathUnitTest.java
@@ -7,13 +7,13 @@ import static org.junit.Assert.assertEquals;
 public class MovingAverageWithApacheCommonsMathUnitTest {
 
     @Test
-    public void when_initial_average_is_calculated_it_should_be_NAN() {
+    public void whenInitialAverageIsCalculated_shouldReturnNAN() {
         MovingAverageWithApacheCommonsMath movingAverageCalculator = new MovingAverageWithApacheCommonsMath(5);
         assertEquals(Double.NaN, movingAverageCalculator.getMovingAverage(), 0.001);
     }
 
     @Test
-    public void when_values_are_added_average_should_update_correctly() {
+    public void whenValuesAreAdded_shouldUpdateAverageCorrectly() {
         MovingAverageWithApacheCommonsMath movingAverageCalculator = new MovingAverageWithApacheCommonsMath(3);
         movingAverageCalculator.add(10);
         assertEquals(10.0, movingAverageCalculator.getMovingAverage(), 0.001);
@@ -24,13 +24,13 @@ public class MovingAverageWithApacheCommonsMathUnitTest {
     }
 
     @Test
-    public void when_window_size_is_full_oldest_value_should_be_dropped() {
+    public void whenWindowSizeIsFull_shouldDropTheOldestValue() {
         MovingAverageWithApacheCommonsMath ma = new MovingAverageWithApacheCommonsMath(2);
         ma.add(10);
         ma.add(20);
         assertEquals(15.0, ma.getMovingAverage(), 0.001);
         ma.add(30);
-        assertEquals(25.0, ma.getMovingAverage(), 0.001); // 10 dropped, 20 and 30 remain
+        assertEquals(25.0, ma.getMovingAverage(), 0.001);
     }
 
 }