diff --git a/android/src/main/java/com/mastercard/compass/cp3/lib/react_native_wrapper/ui/util/Extensions.kt b/android/src/main/java/com/mastercard/compass/cp3/lib/react_native_wrapper/ui/util/Extensions.kt
index a616a5e..eeb858e 100644
--- a/android/src/main/java/com/mastercard/compass/cp3/lib/react_native_wrapper/ui/util/Extensions.kt
+++ b/android/src/main/java/com/mastercard/compass/cp3/lib/react_native_wrapper/ui/util/Extensions.kt
@@ -18,14 +18,16 @@ fun Date.toReadableString(): String {
 }
 
 
-fun populateModalityList (modalities: ArrayList<String>) : MutableList<Modality> {
-  val listOfModalities = mutableListOf<Modality>()
+fun populateModalityList(modalities: ArrayList<String>): MutableList<Modality> {
+    val listOfModalities = mutableListOf<Modality>()
 
-  modalities.forEach {
-    if(it == Key.FACE_MODALITY) listOfModalities.add(Modality.FACE)
-    if(it == Key.LEFT_PALM_MODALITY) listOfModalities.add(Modality.LEFT_PALM)
-    if(it == Key.RIGHT_PALM_MODALITY) listOfModalities.add(Modality.RIGHT_PALM)
-  }
+    modalities.forEach {
+        when (it) {
+            Key.FACE_MODALITY -> listOfModalities.add(Modality.FACE)
+            Key.LEFT_PALM_MODALITY -> listOfModalities.add(Modality.LEFT_PALM)
+            Key.RIGHT_PALM_MODALITY -> listOfModalities.add(Modality.RIGHT_PALM)
+        }
+    }
 
-  return listOfModalities
+    return listOfModalities
 }