diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 4edc9b557..180cf54de 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -641,38 +641,28 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
 
             /// Measurement loop - begin
-            do
-            {
+            do {
                 //--------------------------------
                 switch (ReadRegistersTempPressAmbient(null, true))
                 {
-                    case Event.Error:
-                        retVal = Event.Error;
-                        goto stopTest;
-
-                    case Event.UiCmdStop:
-                        retVal = Event.UiCmdStop;
-                        goto stopTest;
-
-                    case Event.MeasurementCompleted:
-                        goto test_completed;
+                    case Event.Error: retVal = Event.Error; goto stopTest;
+                    case Event.UiCmdStop: retVal = Event.UiCmdStop; goto stopTest;
+                    case Event.MeasurementCompleted: goto test_completed;
                 }
 
                 int remainingTime = Math.Max(estimtdEndTime - StateMachine.Time, 0);
                 if (remainingTime > 60)
-                {
                     Bridge.OnActivity(this, string.Format("{0} ... {1} {2} {3} {4}", Strings.Test_in_progress, remainingTime / 60, "min", remainingTime % 60, Strings.sec));
-                }
                 else
-                {
                     Bridge.OnActivity(this, string.Format("{0} ... {1} s", Strings.Test_in_progress, remainingTime));
-                }
 
                 RefFreq.Val = cBrd.ReferenceFreq;
                 RefFlow.Val = cBrd.ReferenceFlow;
 
 				UpdateAllStatistics(StateMachine.Time);
 
+                #region Heat meters
+
                 if (heatMetersTestParams != null)
                 {
                     if (lastEnergyUpdateTime == 0)
@@ -692,6 +682,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                     }
                 }
 
+                #endregion
+
+                #region Compound
+
                 if (compound)
                 {
                     /// TODO: Reimplement for combined meters
@@ -707,6 +701,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                     //}
                 }
 
+                #endregion
+
                 Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
                 Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
             }