diff --git a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/FrontendMetadataAdapter.kt b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/FrontendMetadataAdapter.kt
index 9e09640e96..7119455cf2 100644
--- a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/FrontendMetadataAdapter.kt
+++ b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/FrontendMetadataAdapter.kt
@@ -36,10 +36,10 @@ class FrontendMetadataAdapter(val gsonSupplier: () -> Gson) : TypeAdapter<Fronte
             writer.name("values").beginArray()
             for ((key, _val) in tup.entries) {
                 writer.beginObject()
-                if(_val is String) {
+                if (_val is String) {
                     writer.name(key).value(_val)
                 }
-                if(_val is Boolean) {
+                if (_val is Boolean) {
                     writer.name(key).value(_val)
                 }
                 writer.endObject()
@@ -68,9 +68,11 @@ class FrontendMetadataAdapter(val gsonSupplier: () -> Gson) : TypeAdapter<Fronte
                     "owner" -> {
                         owner = reader.nextInt()
                     }
+
                     "values" -> {
                         values = readValuesArray(reader)
                     }
+
                     else -> {
                         reader.skipValue()
                     }
@@ -103,9 +105,11 @@ class FrontendMetadataAdapter(val gsonSupplier: () -> Gson) : TypeAdapter<Fronte
                     "key" -> {
                         key = reader.nextString()
                     }
+
                     "value" -> {
                         value = readValue(reader)
                     }
+
                     else -> {
                         reader.skipValue()
                     }
diff --git a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/ParseContextAdapter.kt b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/ParseContextAdapter.kt
index dc8b7d6615..d7a56b10f7 100644
--- a/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/ParseContextAdapter.kt
+++ b/subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/gson/ParseContextAdapter.kt
@@ -63,24 +63,30 @@ class ParseContextAdapter(val gsonSupplier: () -> Gson) : TypeAdapter<ParseConte
                 "metadata" -> {
                     metadata = gson.fromJson(reader, FrontendMetadata::class.java)
                 }
+
                 "cStmtCounter" -> {
                     cStmtCounter = gson.fromJson(reader, CStmtCounter::class.java)
                 }
+
                 "bitwiseOption" -> {
                     val optionName = reader.nextString()
                     bitwiseOption = BitwiseOption.valueOf(optionName)
                 }
+
                 "architecture" -> {
                     val architectureName = reader.nextString()
                     architecture = ArchitectureConfig.ArchitectureType.valueOf(architectureName)
                 }
+
                 "multiThreading" -> {
                     multiThreading = reader.nextBoolean()
                 }
+
                 "arithmetic" -> {
                     val arithmeticName = reader.nextString()
                     arithmetic = ArchitectureConfig.ArithmeticType.valueOf(arithmeticName)
                 }
+
                 else -> {
                     reader.skipValue()
                 }