diff --git a/app/lib/global/models/ayat_list_view_arguments.dart b/app/lib/global/models/ayat_list_view_arguments.dart
index e8d9a53..82b2413 100644
--- a/app/lib/global/models/ayat_list_view_arguments.dart
+++ b/app/lib/global/models/ayat_list_view_arguments.dart
@@ -1,12 +1,12 @@
 import 'package:quran_companion/global/models/ayat_model.dart';
 
-class AyatListViewArguments {
+class AyatListViewArgumentsModel {
   final String title;
   final String subtitle;
   final List<AyatModel> ayats;
   final String? highligtedTerm;
 
-  AyatListViewArguments({
+  AyatListViewArgumentsModel({
     required this.title,
     required this.subtitle,
     required this.ayats,
diff --git a/app/lib/global/utils/keys.dart b/app/lib/global/utils/keys.dart
deleted file mode 100644
index 6bc65a8..0000000
--- a/app/lib/global/utils/keys.dart
+++ /dev/null
@@ -1 +0,0 @@
-const String noteKeyPrefix = 'qcNote';
diff --git a/app/lib/global/utils/routes.dart b/app/lib/global/utils/routes.dart
index 8167f34..f46a5ef 100644
--- a/app/lib/global/utils/routes.dart
+++ b/app/lib/global/utils/routes.dart
@@ -24,8 +24,8 @@ class RoutesPath {
           builder: (context) => SurahParaListView(mode: args),
         );
       case ayatListView:
-        AyatListViewArguments args =
-            settings.arguments as AyatListViewArguments;
+        AyatListViewArgumentsModel args =
+            settings.arguments as AyatListViewArgumentsModel;
         return MaterialPageRoute(
           builder: (context) => AyatListView(arguments: args),
         );
diff --git a/app/lib/views/ayat_list/ayat_list_view.dart b/app/lib/views/ayat_list/ayat_list_view.dart
index 01ef165..725c6b3 100644
--- a/app/lib/views/ayat_list/ayat_list_view.dart
+++ b/app/lib/views/ayat_list/ayat_list_view.dart
@@ -15,7 +15,7 @@ import 'package:stacked_services/stacked_services.dart';
 import '../../global/widgets/ayat_tile/ayat_tile.dart';
 
 class AyatListView extends StatelessWidget {
-  final AyatListViewArguments arguments;
+  final AyatListViewArgumentsModel arguments;
   const AyatListView({
     super.key,
     required this.arguments,
diff --git a/app/lib/views/home/home_view_model.dart b/app/lib/views/home/home_view_model.dart
index 9236314..44ad9e3 100644
--- a/app/lib/views/home/home_view_model.dart
+++ b/app/lib/views/home/home_view_model.dart
@@ -60,7 +60,7 @@ class HomeViewModel extends BaseViewModel {
       _setIsSearching(false);
       _navigationService.navigateTo(
         ayatListView,
-        arguments: AyatListViewArguments(
+        arguments: AyatListViewArgumentsModel(
           title: 'Search Results',
           subtitle: "by word '$_searchText'",
           ayats: searchResults,
diff --git a/app/lib/global/models/surah_para_tile_model.dart b/app/lib/views/surah_para_list/models/surah_para_tile_model.dart
similarity index 100%
rename from app/lib/global/models/surah_para_tile_model.dart
rename to app/lib/views/surah_para_list/models/surah_para_tile_model.dart
diff --git a/app/lib/views/surah_para_list/surah_para_list_view_model.dart b/app/lib/views/surah_para_list/surah_para_list_view_model.dart
index 1f7bb1e..e0ff0da 100644
--- a/app/lib/views/surah_para_list/surah_para_list_view_model.dart
+++ b/app/lib/views/surah_para_list/surah_para_list_view_model.dart
@@ -1,6 +1,6 @@
 import 'package:quran_companion/global/models/ayat_list_view_arguments.dart';
 import 'package:quran_companion/global/models/ayat_model.dart';
-import 'package:quran_companion/global/models/surah_para_tile_model.dart';
+import 'package:quran_companion/views/surah_para_list/models/surah_para_tile_model.dart';
 import 'package:quran_companion/global/repositories/ayat_repository.dart';
 import 'package:quran_companion/global/utils/enums.dart';
 import 'package:quran_companion/global/utils/quran.dart';
@@ -65,7 +65,7 @@ class SurahParaListViewModel extends BaseViewModel {
 
     _navigationService.navigateTo(
       ayatListView,
-      arguments: AyatListViewArguments(
+      arguments: AyatListViewArgumentsModel(
         title: mode.type,
         subtitle: name,
         ayats: surahParaAyats,