diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index 64c1c4e16..45ba1cf73 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -78,9 +78,8 @@ complexity:
     active: true
     threshold: 60
   LongParameterList:
-    active: false
-    functionThreshold: 9
-    constructorThreshold: 9
+    active: true
+    threshold: 6
     ignoreDefaultParameters: false
   MethodOverloading:
     active: false
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
index 6bf125b97..37c74af59 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.kt
@@ -67,11 +67,10 @@ const val DISABLE_ICON_ITEM_ALPHA = 130
 const val ENABLE_ICON_ITEM_ALPHA = 255
 
 class AddNoteDialog : DialogFragment() {
-  private var zimId: String? = null
+  private lateinit var zimId: String
   private var zimFileName: String? = null
   private var zimFileTitle: String? = null
-  private var zimFileUrl: String? = null
-  private var zimFavicon: String? = null
+  private lateinit var zimFileUrl: String
   private var articleTitle: String? = null
 
   // Corresponds to "ArticleUrl" of "{External Storage}/Kiwix/Notes/ZimFileName/ArticleUrl.txt"
@@ -115,16 +114,15 @@ class AddNoteDialog : DialogFragment() {
     zimFileName = zimReaderContainer.zimCanonicalPath
     if (zimFileName != null) { // No zim file currently opened
       zimFileTitle = zimReaderContainer.zimFileTitle
-      zimFavicon = zimReaderContainer.favicon
-      zimId = zimReaderContainer.id
+      zimId = zimReaderContainer.id.orEmpty()
 
       if (arguments != null) {
         articleTitle = arguments?.getString(NOTES_TITLE)
-        zimFileUrl = arguments?.getString(ARTICLE_URL)
+        zimFileUrl = arguments?.getString(ARTICLE_URL).orEmpty()
       } else {
         val webView = (activity as WebViewProvider?)?.getCurrentWebView()
         articleTitle = webView?.title
-        zimFileUrl = webView?.url
+        zimFileUrl = webView?.url.orEmpty()
       }
 
       // Corresponds to "ZimFileName" of "{External Storage}/Kiwix/Notes/ZimFileName/ArticleUrl.txt"
@@ -157,8 +155,8 @@ class AddNoteDialog : DialogFragment() {
 
   private fun getArticleNoteFileName(): String {
     // Returns url of the form: "content://org.kiwix.kiwixmobile.zim.base/A/Main_Page.html"
-    if (arguments != null && arguments?.getString(NOTE_FILE_PATH) != null) {
-      return getTextAfterLastSlashWithoutExtension(arguments?.getString(NOTE_FILE_PATH)!!)
+    arguments?.getString(NOTE_FILE_PATH)?.let {
+      return@getArticleNoteFileName getTextAfterLastSlashWithoutExtension(it)
     }
 
     val articleUrl = (activity as WebViewProvider?)?.getCurrentWebView()?.url
@@ -333,12 +331,12 @@ class AddNoteDialog : DialogFragment() {
 
   private fun addNoteToDao(noteFilePath: String?, title: String) {
     noteFilePath?.let { filePath ->
-      if (filePath.isNotEmpty() && zimFileUrl?.isNotEmpty() == true) {
+      if (filePath.isNotEmpty() && zimFileUrl.isNotEmpty()) {
         val zimReader = zimReaderContainer.zimFileReader
         if (zimReader != null) {
           val noteToSave = NoteListItem(
             title = title,
-            url = zimFileUrl!!,
+            url = zimFileUrl,
             noteFilePath = noteFilePath,
             zimFileReader = zimReader
           )
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/page/viewmodel/effects/OpenNote.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/page/viewmodel/effects/OpenNote.kt
index b3cab3597..fe15a416a 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/page/viewmodel/effects/OpenNote.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/page/viewmodel/effects/OpenNote.kt
@@ -24,9 +24,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import org.kiwix.kiwixmobile.core.base.SideEffect
 import org.kiwix.kiwixmobile.core.main.AddNoteDialog
-import org.kiwix.kiwixmobile.core.main.AddNoteDialog.Companion.NOTE_FILE_PATH
 import org.kiwix.kiwixmobile.core.main.AddNoteDialog.Companion.ARTICLE_URL
 import org.kiwix.kiwixmobile.core.main.AddNoteDialog.Companion.NOTES_TITLE
+import org.kiwix.kiwixmobile.core.main.AddNoteDialog.Companion.NOTE_FILE_PATH
 import org.kiwix.kiwixmobile.core.main.CoreMainActivity
 
 class OpenNote(
@@ -40,18 +40,19 @@ class OpenNote(
   }
 
   private fun showAddNoteDialog(activity: AppCompatActivity) {
-    val act: CoreMainActivity = activity as CoreMainActivity
+    val coreMainActivity: CoreMainActivity = activity as CoreMainActivity
     val fragmentTransaction: FragmentTransaction =
-      act.supportFragmentManager.beginTransaction()
+      coreMainActivity.supportFragmentManager.beginTransaction()
     val previousInstance: Fragment? =
-      act.supportFragmentManager.findFragmentByTag(AddNoteDialog.TAG)
+      coreMainActivity.supportFragmentManager.findFragmentByTag(AddNoteDialog.TAG)
 
     if (previousInstance == null) {
       val dialogFragment = AddNoteDialog()
-      val bundle = Bundle()
-      bundle.putString(NOTE_FILE_PATH, noteFilePath)
-      bundle.putString(ARTICLE_URL, zimFileUrl)
-      bundle.putString(NOTES_TITLE, title)
+      val bundle = Bundle().apply {
+        putString(NOTE_FILE_PATH, noteFilePath)
+        putString(ARTICLE_URL, zimFileUrl)
+        putString(NOTES_TITLE, title)
+      }
       dialogFragment.arguments = bundle
       dialogFragment.show(fragmentTransaction, AddNoteDialog.TAG)
     }