diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
index d418123..da2399d 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
@@ -73,7 +73,6 @@ import java.util.Locale
 @RuntimePermissions
 class MainActivity : AppCompatActivity(), AnkoLogger {
     private lateinit var config: Config
-    //    private val aboutConfig: AboutConfig = AboutConfig.getInstance()
     private val configurationsData = "configurations.dat"
     private val currentConfigData = "config.dat"
     private val defaultConfigurations = listOf(
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt
index eea1779..858a2f6 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt
@@ -45,18 +45,28 @@ data class Field(
     }
 
     @Suppress("unused")
-    constructor() : this("", "", false, false, false, -1, -1, -1, -1)
+    constructor() : this(
+        hint = "",
+        digits = "",
+        alpha = false,
+        alt = false,
+        zeros = false,
+        minSize = -1,
+        size = -1,
+        min = -1,
+        max = -1
+    )
 
     constructor(source: Parcel) : this(
-        source.readString().ifNull(),
-        source.readString().ifNull(),
-        1 == source.readInt(),
-        1 == source.readInt(),
-        1 == source.readInt(),
-        source.readInt(),
-        source.readInt(),
-        source.readInt(),
-        source.readInt()
+        hint = source.readString().ifNull(),
+        digits = source.readString().ifNull(),
+        alpha = 1 == source.readInt(),
+        alt = 1 == source.readInt(),
+        zeros = 1 == source.readInt(),
+        minSize = source.readInt(),
+        size = source.readInt(),
+        min = source.readInt(),
+        max = source.readInt()
     )
 
     override fun describeContents() = 0
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
index b1d693b..27b7a53 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
@@ -40,14 +40,20 @@ data class Option(
         }
     }
 
-    constructor() : this("", emptyList(), false, false, "")
+    constructor() : this(
+        title = "",
+        fields = emptyList(),
+        nodial = false,
+        nosteps = false,
+        dtmf = ""
+    )
 
     constructor(source: Parcel) : this(
-        source.readString().ifNull(),
-        source.createTypedArrayList(Field.CREATOR) ?: emptyList(),
-        1 == source.readInt(),
-        1 == source.readInt(),
-        source.readString().ifNull()
+        title = source.readString().ifNull(),
+        fields = source.createTypedArrayList(Field.CREATOR) ?: emptyList(),
+        nodial = 1 == source.readInt(),
+        nosteps = 1 == source.readInt(),
+        dtmf = source.readString().ifNull()
     )
 
     override fun compareTo(other: Option): Int = title.compareTo(other.title)
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt
index 1ffddcb..17cc24c 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt
@@ -45,7 +45,17 @@ data class Params(
         }
     }
 
-    constructor() : this("", "", "", "", -1, "", "", "", "")
+    constructor() : this(
+        name = "",
+        type = "",
+        phone = "",
+        master = "",
+        size = -1,
+        ack = "",
+        alt = "",
+        begin = "",
+        end = ""
+    )
 
     constructor(source: Parcel) : this(
         source.readString().ifNull(),