diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt
index 6594df3458..35c8ec3a7b 100755
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt
@@ -169,12 +169,11 @@ enum class MedtronicCommandType(
     var allowedRetries = 2
 
     //var maxAllowedTime = 2000
-    //var parameterType: MinimedCommandParameterType? = parameterType
     var minimalBufferSizeToStartReading = 14
 
     init {
         commandCode = code.toByte()
-        this.commandParametersCount = if (commandParameters != null) commandParameters!!.size else 0
+        this.commandParametersCount = commandParameters?.size ?: 0
         allowedRetries = 2
         if (this.parameterType == MinimedCommandParameterType.SubCommands) {
             minimalBufferSizeToStartReading = 200