diff --git a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
index 6a1951e..f47bf63 100644
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -1,6 +1,6 @@
 package com.example.hpostesting.data.constant
 
-enum class TestStatus(val CODE: Double) {
+enum class TestStatus(val code: Double) {
     TEST_STARTED(1.0),
     CONFIG_STARTED(2.0),
     CONFIG_COMPLETED(3.0),
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index d244e5b..44d10bc 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -377,7 +377,7 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.deviceMessages.postValue(currentResultData)
 
         when {
-            resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.CODE -> {
+            resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
                 if (resultData.contains("HCV")) {
                     processHardwareId(resultData, "HCV", 12)
                 }
@@ -387,29 +387,29 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
-            resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.CODE -> {
+            resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
-                this.testStatusCode = TestStatus.BUFFER_STARTED.CODE
+                this.testStatusCode = TestStatus.BUFFER_STARTED.code
             }
 
-            resultData.contains("#BC") && this.testStatusCode < TestStatus.BUFFER_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.BUFFER_COMPLETED.CODE
+            resultData.contains("#BC") && this.testStatusCode < TestStatus.BUFFER_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.BUFFER_COMPLETED.code
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = getString(R.string.buffer_completed)
                     binding.btnSamplestart.visibility = View.VISIBLE
                 }
             }
 
-            resultData.contains("#SS1") && this.testStatusCode < TestStatus.SAMPLE_STARTED.CODE -> {
-                this.testStatusCode = TestStatus.SAMPLE_STARTED.CODE
+            resultData.contains("#SS1") && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
+                this.testStatusCode = TestStatus.SAMPLE_STARTED.code
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = getString(R.string.sample_started)
                     binding.btnSamplestart.visibility = View.GONE
                 }
             }
 
-            resultData.contains("#SC1") && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.SAMPLE_COMPLETED.CODE
+            resultData.contains("#SC1") && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
                 fetchResult()
@@ -423,47 +423,47 @@ class HemoCubeFragment : Fragment() {
                 )
             }
             
-            currentResultData.contains("#SS2") && this.testStatusCode < TestStatus.FIRST_GAIN_STARTED.CODE -> {
-                this.testStatusCode = TestStatus.FIRST_GAIN_STARTED.CODE
+            currentResultData.contains("#SS2") && this.testStatusCode < TestStatus.FIRST_GAIN_STARTED.code -> {
+                this.testStatusCode = TestStatus.FIRST_GAIN_STARTED.code
                 hemoCubeViewModel.messages.postValue("1.3X Gain Started")
             }
 
-            currentResultData.contains("#SC2") && this.testStatusCode < TestStatus.FIRST_GAIN_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.FIRST_GAIN_COMPLETED.CODE
+            currentResultData.contains("#SC2") && this.testStatusCode < TestStatus.FIRST_GAIN_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.FIRST_GAIN_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("1.3X Gain Completed")
                 fetchResult()
             }
 
-            currentResultData.contains("#SS3") && this.testStatusCode < TestStatus.SECOND_GAIN_STARTED.CODE -> {
-                this.testStatusCode = TestStatus.SECOND_GAIN_STARTED.CODE
+            currentResultData.contains("#SS3") && this.testStatusCode < TestStatus.SECOND_GAIN_STARTED.code -> {
+                this.testStatusCode = TestStatus.SECOND_GAIN_STARTED.code
                 hemoCubeViewModel.messages.postValue("2X Gain Started")
             }
 
-            currentResultData.contains("#SC3") && this.testStatusCode < TestStatus.SECOND_GAIN_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.SECOND_GAIN_COMPLETED.CODE
+            currentResultData.contains("#SC3") && this.testStatusCode < TestStatus.SECOND_GAIN_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.SECOND_GAIN_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("2X Gain Completed")
                 fetchResult()
             }
 
-            currentResultData.contains("#SS5") && this.testStatusCode < TestStatus.FORTH_GAIN_STARTED.CODE -> {
-                this.testStatusCode = TestStatus.FORTH_GAIN_STARTED.CODE
+            currentResultData.contains("#SS5") && this.testStatusCode < TestStatus.FORTH_GAIN_STARTED.code -> {
+                this.testStatusCode = TestStatus.FORTH_GAIN_STARTED.code
                 hemoCubeViewModel.messages.postValue("7.6X Gain Started")
             }
 
-            currentResultData.contains("#SC5") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.CONFIG_COMPLETED.CODE
+            currentResultData.contains("#SC5") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.CONFIG_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("7.6X Gain Completed")
                 fetchResult()
             }
 
-            resultData.contains("REND") && this.testStatusCode < TestStatus.SAMPLE_PRINT_COMPLETED.CODE -> {
+            resultData.contains("REND") && this.testStatusCode < TestStatus.SAMPLE_PRINT_COMPLETED.code -> {
                 handleSampleCompleted()
             }
 
             currentResultData.contains("REND")
-                    && this.testStatusCode >= TestStatus.FIRST_GAIN_COMPLETED.CODE
-                    && this.testStatusCode < TestStatus.FIRST_GAIN_PRINT_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.FIRST_GAIN_PRINT_COMPLETED.CODE
+                    && this.testStatusCode >= TestStatus.FIRST_GAIN_COMPLETED.code
+                    && this.testStatusCode < TestStatus.FIRST_GAIN_PRINT_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.FIRST_GAIN_PRINT_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("1.3X gain data gathered")
 
                 val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
@@ -479,9 +479,9 @@ class HemoCubeFragment : Fragment() {
             }
 
             currentResultData.contains("REND")
-                    && this.testStatusCode >= TestStatus.FIRST_GAIN_PRINT_COMPLETED.CODE
-                    && this.testStatusCode < TestStatus.SECOND_GAIN_PRINT_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.SECOND_GAIN_PRINT_COMPLETED.CODE
+                    && this.testStatusCode >= TestStatus.FIRST_GAIN_PRINT_COMPLETED.code
+                    && this.testStatusCode < TestStatus.SECOND_GAIN_PRINT_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.SECOND_GAIN_PRINT_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("2X gain data gathered")
 
                 val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
@@ -497,9 +497,9 @@ class HemoCubeFragment : Fragment() {
             }
 
             currentResultData.contains("REND")
-                    && this.testStatusCode >= TestStatus.SECOND_GAIN_PRINT_COMPLETED.CODE
-                    && this.testStatusCode < TestStatus.FORTH_GAIN_PRINT_COMPLETED.CODE -> {
-                this.testStatusCode = TestStatus.FORTH_GAIN_PRINT_COMPLETED.CODE
+                    && this.testStatusCode >= TestStatus.SECOND_GAIN_PRINT_COMPLETED.code
+                    && this.testStatusCode < TestStatus.FORTH_GAIN_PRINT_COMPLETED.code -> {
+                this.testStatusCode = TestStatus.FORTH_GAIN_PRINT_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("7.6X gain data gathered")
 
                 val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
@@ -531,7 +531,7 @@ class HemoCubeFragment : Fragment() {
 
     fun handleSampleCompleted() {
 
-        this.testStatusCode = TestStatus.SAMPLE_PRINT_COMPLETED.CODE
+        this.testStatusCode = TestStatus.SAMPLE_PRINT_COMPLETED.code
         hemoCubeViewModel.messages.postValue(
             getString(R.string.data_collected_processing_data)
         )
@@ -583,7 +583,7 @@ class HemoCubeFragment : Fragment() {
                 putString(Constants.DEVICE_ID, deviceHardwareId)
                 apply()
             }
-            this.testStatusCode = TestStatus.CONFIG_COMPLETED.CODE
+            this.testStatusCode = TestStatus.CONFIG_COMPLETED.code
             activity?.runOnUiThread {
                 binding.btnPlacebuffer.visibility = View.VISIBLE
             }