diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt
index f4b551be1..d2d20b6df 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt
@@ -78,7 +78,7 @@ fun toInt32(bytes: ByteArray): Int {
 }
 
 fun parseTLV(data: ByteArray): Map<Byte, List<ByteArray>> {
-  var result = mutableMapOf<Byte, MutableList<ByteArray>>()
+  val result = mutableMapOf<Byte, MutableList<ByteArray>>()
   var rest = data
   while (rest.isNotEmpty()) {
     val t = rest[0]
@@ -88,9 +88,9 @@ fun parseTLV(data: ByteArray): Map<Byte, List<ByteArray>> {
     if (v.size < l) continue
 
     if (!result.containsKey(t)) {
-      result.put(t, mutableListOf())
+      result[t] = mutableListOf()
     }
-    result.get(t)?.add(v)
+    result[t]?.add(v)
   }
   return result
 }
diff --git a/app/src/test/java/com/vitorpamplona/amethyst/service/Nip19Test.kt b/app/src/test/java/com/vitorpamplona/amethyst/service/Nip19Test.kt
index 02e6a5695..414422dd3 100644
--- a/app/src/test/java/com/vitorpamplona/amethyst/service/Nip19Test.kt
+++ b/app/src/test/java/com/vitorpamplona/amethyst/service/Nip19Test.kt
@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
 import org.junit.Assert
+import org.junit.Ignore
 import org.junit.Test
 
 class Nip19Test {
@@ -18,8 +19,15 @@ class Nip19Test {
   @Test()
   fun to_int_32_length_4() {
     val actual = toInt32(byteArrayOfInts(1, 2, 3, 4))
+
     Assert.assertEquals(16909060, actual)
   }
 
+  @Ignore("Not implemented yet")
+  @Test()
+  fun parse_TLV() {
+    // TODO
+  }
+
   private fun byteArrayOfInts(vararg ints: Int) = ByteArray(ints.size) { pos -> ints[pos].toByte() }
 }