diff --git a/app/build.gradle b/app/build.gradle
index 2653a19..6b6e16b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,56 +50,53 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.0-alpha06'
 
     // Android KTX
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
 
     // UI
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation 'com.yarolegovich:discrete-scrollview:1.4.9'
     implementation "androidx.fragment:fragment-ktx:1.3.0-alpha05"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     // Navigation
-    implementation "androidx.navigation:navigation-fragment-ktx:2.3.0-beta01"
-    implementation "androidx.navigation:navigation-ui-ktx:2.3.0-beta01"
+    def navigation_version = '2.3.0-beta01'
+    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 
     // Coroutines for getting off the UI thread
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5"
+    def coroutines_version = '1.3.5'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
     // Retrofit for networking
-    implementation 'com.squareup.retrofit2:retrofit:2.7.1'
+    def retrofit2_version = '2.7.1'
+    implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
-    implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
-    implementation 'com.squareup.retrofit2:converter-scalars:2.7.1'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.7.1'
-
-    //OkHTTP
-    implementation "com.squareup.okhttp3:okhttp:4.4.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.4.0"
 
     //Parsing the JSON format
-    implementation 'com.squareup.moshi:moshi:1.9.2'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.9.2'
     implementation 'com.google.code.gson:gson:2.8.6'
-    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.9.2'
+
+    //OkHTTP
+    def okhttp3_version = '4.4.0'
+    implementation "com.squareup.okhttp3:okhttp:$okhttp3_version"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp3_version"
+
 
     //Firebase
     implementation 'com.google.firebase:firebase-auth:19.3.1'
     implementation 'com.google.android.gms:play-services-auth:18.0.0'
     implementation 'com.google.firebase:firebase-firestore-ktx:21.4.3'
 
-    // arch components
+    // Arch components
     // ViewModel and LiveData
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha03'
+    def lifecycle_version = '2.2.0'
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 
     // glide for images
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-    kapt 'com.github.bumptech.glide:compiler:4.11.0'
-
-//    //Database
-//    implementation "androidx.room:room-runtime:2.2.4"
-//    kapt "androidx.room:room-compiler:2.2.4"
+    def glide_version = '4.11.0'
+    implementation "com.github.bumptech.glide:glide:$glide_version"
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
 
     //Dagger 2
     def dagger_version = '2.26'
diff --git a/app/src/main/java/com/example/movieapp/dagger/App.kt b/app/src/main/java/com/example/movieapp/dagger/App.kt
index 0dbfeca..1eb4a61 100644
--- a/app/src/main/java/com/example/movieapp/dagger/App.kt
+++ b/app/src/main/java/com/example/movieapp/dagger/App.kt
@@ -6,9 +6,8 @@ import com.example.movieapp.dagger.component.DaggerAppComponent
 import com.example.movieapp.dagger.module.NetworkModule
 
 class App : Application(){
-    companion object{
-        lateinit var appComponent: AppComponent
-    }
+
+    companion object{ lateinit var appComponent: AppComponent }
 
     override fun onCreate() {
         super.onCreate()
diff --git a/app/src/main/java/com/example/movieapp/dagger/module/NetworkModule.kt b/app/src/main/java/com/example/movieapp/dagger/module/NetworkModule.kt
index 76b7250..b26b0d6 100644
--- a/app/src/main/java/com/example/movieapp/dagger/module/NetworkModule.kt
+++ b/app/src/main/java/com/example/movieapp/dagger/module/NetworkModule.kt
@@ -6,8 +6,6 @@ import com.example.movieapp.model.network.news.NewsApi
 import com.example.movieapp.model.network.news.NewsSource
 import com.example.movieapp.model.network.MovieListSource
 import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
@@ -16,8 +14,6 @@ import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
-import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.io.File
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -41,8 +37,7 @@ class NetworkModule (private val application: Application) {
             .readTimeout(60, TimeUnit.SECONDS)
             .writeTimeout(60, TimeUnit.SECONDS)
             .addInterceptor(interceptor)
-            .build()
-    }
+            .build() }
 
     @Provides
     @Reusable
diff --git a/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelFactory.kt b/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelFactory.kt
index baa96a7..4db38b4 100644
--- a/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelFactory.kt
+++ b/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelFactory.kt
@@ -13,9 +13,7 @@ class ViewModelFactory @Inject constructor(private val viewModels: MutableMap<Cl
         if (usedViewModelMap.contains(modelClass)) {
             return usedViewModelMap[modelClass] as T
         }
-
-        val viewModelProvider = viewModels[modelClass]
-            ?: throw IllegalArgumentException(" model class $modelClass not found")
+        val viewModelProvider = viewModels[modelClass] ?: throw IllegalArgumentException(" model class $modelClass not found")
 
         val viewModel = viewModelProvider.get()
         usedViewModelMap[viewModel::class.java] = viewModel
diff --git a/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelModule.kt b/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelModule.kt
index ef72e0f..964d499 100644
--- a/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelModule.kt
+++ b/app/src/main/java/com/example/movieapp/dagger/module/viewModule/ViewModelModule.kt
@@ -43,7 +43,6 @@ abstract class ViewModelModule {
     @ViewModelKey(DetailNewsViewModel::class)
     internal abstract fun bindDetailNewsViewModel(viewModel: DetailNewsViewModel): ViewModel
 
-
     @Binds
     @IntoMap
     @ViewModelKey(ProfileViewModel::class)
diff --git a/app/src/main/java/com/example/movieapp/model/network/MovieApi.kt b/app/src/main/java/com/example/movieapp/model/network/MovieApi.kt
index 1d727bf..e5490d9 100644
--- a/app/src/main/java/com/example/movieapp/model/network/MovieApi.kt
+++ b/app/src/main/java/com/example/movieapp/model/network/MovieApi.kt
@@ -1,8 +1,8 @@
 package com.example.movieapp.model.network
 
 import com.example.movieapp.model.network.data.MovieInfo
-import com.example.movieapp.model.network.data.SmallMovie
 import com.example.movieapp.model.network.data.Results
+import com.example.movieapp.model.network.data.SmallMovie
 import com.example.movieapp.utils.API_KEY
 import retrofit2.http.GET
 import retrofit2.http.Path
diff --git a/app/src/main/java/com/example/movieapp/ui/home/detail/DetailFragment.kt b/app/src/main/java/com/example/movieapp/ui/home/detail/DetailFragment.kt
index 11ad939..1b64308 100644
--- a/app/src/main/java/com/example/movieapp/ui/home/detail/DetailFragment.kt
+++ b/app/src/main/java/com/example/movieapp/ui/home/detail/DetailFragment.kt
@@ -42,50 +42,42 @@ class DetailFragment : Fragment() {
     ): View? {
         App.appComponent.inject(this)
 
-
-
         binding = DetailFragmentBinding.inflate(inflater)
         viewModel = ViewModelProvider(this, viewModelFactory).get(DetailViewModel::class.java)
+
         val args = DetailFragmentArgs.fromBundle(requireArguments()).id
 
         sharedPreferences = activity?.getSharedPreferences(SHARED_KEY, Context.MODE_PRIVATE)!!
-        val id =  sharedPreferences.getString(SHARED_KEY, null)
+        val id = sharedPreferences.getString(SHARED_KEY, null)
+
         if (id != null) {
             viewModel.getUserId(id)
             viewModel.checkForSavedMovie(id)
         }
 
-
-
-
         viewModel.getSelectedMovieById(args)
 
-
         binding.imageButton.setOnClickListener {
-            if (id == null  || id == "null"){
+            if (id == null || id == "null") {
                 Toast.makeText(context, "Please Sing in your account", Toast.LENGTH_SHORT).show()
-            } else{
+            } else {
                 Toast.makeText(context, "Save", Toast.LENGTH_SHORT).show()
                 viewModel.putMovieInDatabase()
             }
         }
 
         viewModel.test.observe(viewLifecycleOwner, Observer {
-            if(it){
+            if (it) {
                 binding.imageButton.visibility = View.GONE
             } else {
                 binding.imageButton.visibility = View.VISIBLE
             }
-
         })
 
-
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
         return binding.root
     }
-
-
 }
 
 
diff --git a/app/src/main/java/com/example/movieapp/ui/home/detail/DetailViewModel.kt b/app/src/main/java/com/example/movieapp/ui/home/detail/DetailViewModel.kt
index 60fbeb7..45e4e3e 100644
--- a/app/src/main/java/com/example/movieapp/ui/home/detail/DetailViewModel.kt
+++ b/app/src/main/java/com/example/movieapp/ui/home/detail/DetailViewModel.kt
@@ -91,5 +91,4 @@ class DetailViewModel @Inject constructor(private val movieDetailSource: MovieDe
                     }
             }
         }
-    }
-
+    }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/movieapp/ui/home/list/ListFragment.kt b/app/src/main/java/com/example/movieapp/ui/home/list/ListFragment.kt
index 998e2ed..1e00384 100644
--- a/app/src/main/java/com/example/movieapp/ui/home/list/ListFragment.kt
+++ b/app/src/main/java/com/example/movieapp/ui/home/list/ListFragment.kt
@@ -45,17 +45,13 @@ class ListFragment : Fragment() {
         movieCategory = ListFragmentArgs.fromBundle(requireArguments()).category
         sendNewMovieList(movieCategory)
 
-        // Create Toolbar and button of back in toolbar
-
-
         setMovieListToRV()
 
         //Looking for the internet connection
-        viewModel.eventNetworkError.observe(this, Observer {
+        viewModel.eventNetworkError.observe(viewLifecycleOwner, Observer {
             if (it) onNetworkError()
         })
 
-
         binding.lifecycleOwner = this
 
         return binding.root
diff --git a/app/src/main/java/com/example/movieapp/ui/home/list/ListViewModel.kt b/app/src/main/java/com/example/movieapp/ui/home/list/ListViewModel.kt
index b4fa960..b9d74e3 100644
--- a/app/src/main/java/com/example/movieapp/ui/home/list/ListViewModel.kt
+++ b/app/src/main/java/com/example/movieapp/ui/home/list/ListViewModel.kt
@@ -62,8 +62,4 @@ class ListViewModel @Inject constructor(private  val networkSource: MovieListSou
     fun onNetworkErrorShown() {
         _isNetworkErrorShown.value = true
     }
-
-
-
-
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/movieapp/ui/home/overview/OverviewFragment.kt b/app/src/main/java/com/example/movieapp/ui/home/overview/OverviewFragment.kt
index dfa9349..652a2aa 100644
--- a/app/src/main/java/com/example/movieapp/ui/home/overview/OverviewFragment.kt
+++ b/app/src/main/java/com/example/movieapp/ui/home/overview/OverviewFragment.kt
@@ -34,7 +34,6 @@ class OverviewFragment : Fragment() {
 
     private var errorSnackbar: Snackbar? = null
 
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -65,7 +64,6 @@ class OverviewFragment : Fragment() {
             }
         })
 
-
         //Looking for the internet connection
         viewModel.eventNetworkError.observe(viewLifecycleOwner, Observer {
             if (it) onNetworkError()
diff --git a/app/src/main/res/drawable/ic_email_black_24dp.xml b/app/src/main/res/drawable/ic_email_black_24dp.xml
deleted file mode 100644
index ff831e0..0000000
--- a/app/src/main/res/drawable/ic_email_black_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_local_phone_black_24dp.xml b/app/src/main/res/drawable/ic_local_phone_black_24dp.xml
deleted file mode 100644
index ccdb67c..0000000
--- a/app/src/main/res/drawable/ic_local_phone_black_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
-</vector>
diff --git a/app/src/main/res/layout/detail_fragment.xml b/app/src/main/res/layout/detail_fragment.xml
index 278f15a..7de014a 100644
--- a/app/src/main/res/layout/detail_fragment.xml
+++ b/app/src/main/res/layout/detail_fragment.xml
@@ -22,6 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/frameLayout"
                 android:layout_width="match_parent"
@@ -42,7 +43,7 @@
                 app:layout_constraintTop_toTopOf="@+id/toolbar" />
 
 
-                <TextView
+            <TextView
                     android:id="@+id/title_detail"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -59,36 +60,34 @@
                     tools:text="They Shall Not Grow Old" />
 
             <TextView
-                android:id="@+id/year_ditale"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="@+id/title_detail"
-                app:layout_constraintTop_toBottomOf="@+id/title_detail"
-                tools:text="2019"
-                android:text="@{viewModel.selectProperty.release_date}"
-                />
+                    android:id="@+id/year_ditale"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="@+id/title_detail"
+                    app:layout_constraintTop_toBottomOf="@+id/title_detail"
+                    tools:text="2019"
+                    android:text="@{viewModel.selectProperty.release_date}" />
 
 
-            <TextView
-                android:id="@+id/year_ditale2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:genre="@{viewModel.selectProperty.genres}"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="@+id/title_detail"
-                app:layout_constraintTop_toBottomOf="@+id/year_ditale"
-                tools:text="2019" />
+                <TextView
+                    android:id="@+id/year_ditale2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:genre="@{viewModel.selectProperty.genres}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="@+id/title_detail"
+                    app:layout_constraintTop_toBottomOf="@+id/year_ditale"
+                    tools:text="2019" />
 
                 <TextView
                     android:id="@+id/langue"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-
                     android:layout_marginEnd="16dp"
                     android:text="@{viewModel.selectProperty.original_language}"
                     app:layout_constraintBottom_toBottomOf="@+id/title_detail"
@@ -96,18 +95,18 @@
                     app:layout_constraintTop_toTopOf="@+id/title_detail"
                     tools:text="English" />
 
-            <TextView
-                android:id="@+id/textView4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:text="@string/plot"
-                android:textColor="?attr/editTextColor"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/year_ditale2" />
+                <TextView
+                    android:id="@+id/textView4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/plot"
+                    android:textColor="?attr/editTextColor"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/year_ditale2" />
 
                 <TextView
                     android:id="@+id/textView11"
@@ -123,6 +122,7 @@
                     app:layout_constraintStart_toStartOf="@+id/textView4"
                     app:layout_constraintTop_toBottomOf="@+id/textView4"
                     tools:text="A documentary about World War I with never-before-seen footage to commemorate the centennial of the end of the war." />
+
                 <ImageButton
                     android:id="@+id/imageButton"
                     android:layout_width="wrap_content"
@@ -136,7 +136,9 @@
                     app:srcCompat="@drawable/ic_save_black_24dp" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
+
         </LinearLayout>
+
     </ScrollView>