diff --git a/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsActivity.kt b/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsActivity.kt
index 2cb99984..a66230db 100644
--- a/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsActivity.kt
+++ b/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsActivity.kt
@@ -24,11 +24,10 @@ class MovieDetailsActivity : BaseActivity() {
     companion object {
         private const val INTENT_EXTRA_PARAM_MOVIE = "com.fernandocejas.INTENT_PARAM_MOVIE"
 
-        fun callingIntent(context: Context, movie: MovieView): Intent {
-            val intent = Intent(context, MovieDetailsActivity::class.java)
-            intent.putExtra(INTENT_EXTRA_PARAM_MOVIE, movie)
-            return intent
-        }
+        fun callingIntent(context: Context, movie: MovieView) =
+            Intent(context, MovieDetailsActivity::class.java).apply {
+                putExtra(INTENT_EXTRA_PARAM_MOVIE, movie)
+            }
     }
 
     override fun fragment() = MovieDetailsFragment.forMovie(intent.getParcelableExtra(INTENT_EXTRA_PARAM_MOVIE))
diff --git a/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsFragment.kt b/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsFragment.kt
index 6326633f..5e90b036 100644
--- a/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsFragment.kt
+++ b/app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsFragment.kt
@@ -17,6 +17,7 @@ package com.fernandocejas.sample.features.movies
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.os.bundleOf
 import com.fernandocejas.sample.core.platform.BaseFragment
 import com.fernandocejas.sample.R
 import com.fernandocejas.sample.features.movies.MovieFailure.NonExistentMovie
@@ -46,14 +47,8 @@ class MovieDetailsFragment : BaseFragment() {
     companion object {
         private const val PARAM_MOVIE = "param_movie"
 
-        fun forMovie(movie: MovieView?): MovieDetailsFragment {
-            val movieDetailsFragment = MovieDetailsFragment()
-            movie?.let {
-                val arguments = Bundle()
-                arguments.putParcelable(PARAM_MOVIE, it)
-                movieDetailsFragment.arguments = arguments
-            }
-            return movieDetailsFragment
+        fun forMovie(movie: MovieView?) = MovieDetailsFragment().apply {
+            arguments = bundleOf(PARAM_MOVIE to movie)
         }
     }