diff --git a/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt
index 765299c..6431e22 100644
--- a/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/wirelessalien/android/bhagavadgita/ExampleInstrumentedTest.kt
@@ -76,14 +76,12 @@
 
 package com.wirelessalien.android.bhagavadgita
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt
index c8fb6ce..7589596 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/AboutGitaActivity.kt
@@ -23,7 +23,6 @@ package com.wirelessalien.android.bhagavadgita.activity
 import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.databinding.ActivityAboutGitaBinding
 import com.wirelessalien.android.bhagavadgita.utils.Themes
 
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt
index 22d982d..59c41d4 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/HanumanChalisaActivity.kt
@@ -20,7 +20,6 @@
 
 package com.wirelessalien.android.bhagavadgita.activity
 
-import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -28,7 +27,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.databinding.ActivityHanumanChalisaBinding
 import com.wirelessalien.android.bhagavadgita.fragment.HanumanChalisaE
 import com.wirelessalien.android.bhagavadgita.fragment.HanumanChalisaH
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
index 1d49b5c..73a9ace 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseDetailActivity.kt
@@ -28,9 +28,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.os.VibrationAttributes
-import android.os.VibrationEffect
-import android.os.Vibrator
 import android.util.Log
 import android.view.GestureDetector
 import android.view.HapticFeedbackConstants
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt
index 633faf4..dccb11e 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/activity/VerseTranslationActivity.kt
@@ -27,7 +27,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.adapter.TranslationAdapter
 import com.wirelessalien.android.bhagavadgita.data.Translation
 import com.wirelessalien.android.bhagavadgita.databinding.ActivityVerseTranslationBinding
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt
index 67e21f8..9f8d9d1 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/adapter/ChapterAdapter.kt
@@ -22,11 +22,9 @@ package com.wirelessalien.android.bhagavadgita.adapter
 
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.activity.ChapterDetailsActivity
 import com.wirelessalien.android.bhagavadgita.data.Chapter
 import com.wirelessalien.android.bhagavadgita.databinding.ChapterCardviewItemBinding
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt
index a6e37c9..c9ae210 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/fragment/ThemeFragment.kt
@@ -21,18 +21,14 @@ package com.wirelessalien.android.bhagavadgita.fragment
 
 import android.app.Dialog
 import android.content.Context
-import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.wirelessalien.android.bhagavadgita.MainActivity
 import com.wirelessalien.android.bhagavadgita.R
 import com.wirelessalien.android.bhagavadgita.databinding.FragmentThemeBinding
-import kotlin.properties.Delegates
 
 class ThemeFragment : DialogFragment() {
     private lateinit var binding: FragmentThemeBinding
diff --git a/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt
index 3a8ac11..ea731cf 100644
--- a/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt
+++ b/app/src/main/java/com/wirelessalien/android/bhagavadgita/utils/Themes.kt
@@ -2,7 +2,6 @@ package com.wirelessalien.android.bhagavadgita.utils
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.ContentProviderCompat.requireContext
 import com.wirelessalien.android.bhagavadgita.R
 
 class Themes {
diff --git a/app/src/main/res/layout/activity_verse_translation.xml b/app/src/main/res/layout/activity_verse_translation.xml
index ffa344e..371f7bb 100644
--- a/app/src/main/res/layout/activity_verse_translation.xml
+++ b/app/src/main/res/layout/activity_verse_translation.xml
@@ -19,10 +19,8 @@
   -->
 
 <!-- activity_translation_list.xml -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt b/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt
index 61fc20d..40a2ea3 100644
--- a/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt
+++ b/app/src/test/java/com/wirelessalien/android/bhagavadgita/ExampleUnitTest.kt
@@ -76,9 +76,8 @@
 
 package com.wirelessalien.android.bhagavadgita
 
-import org.junit.Test
-
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).