diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
index 2ea8014f7fd9732e320f54d07f40d77e06d36afb..c1445ea32146b69af86b568d53349b91a0c1c288 100644
--- a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
+++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
@@ -26,12 +26,10 @@ import android.view.View
 internal class FlexItemClickListener(private val activity: AppCompatActivity, private val flexItemChangedListener: FlexItemChangedListener,
                                      private val viewIndex: Int) : View.OnClickListener {
 
-    override fun onClick(v: View) {
-        val fragment = FlexItemEditFragment
-                .newInstance(v.layoutParams as FlexItem, viewIndex)
-        fragment.setFlexItemChangedListener(flexItemChangedListener)
-        fragment.show(activity.supportFragmentManager, EDIT_DIALOG_TAG)
-    }
+    override fun onClick(v: View) =
+            FlexItemEditFragment.newInstance(v.layoutParams as FlexItem, viewIndex).apply {
+                setFlexItemChangedListener(flexItemChangedListener)
+            }.show(activity.supportFragmentManager, EDIT_DIALOG_TAG)
 
     companion object {
 
diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
index cd8516141764906f0b7e4f9975f5504d7c5b25e8..1b7ee9ecd4fc26f3347d877ad0fa304a20222d49 100644
--- a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
+++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
@@ -374,13 +374,11 @@ internal class FlexItemEditFragment : DialogFragment() {
 
         private const val VIEW_INDEX_KEY = "view_index"
 
-        fun newInstance(flexItem: FlexItem, viewIndex: Int): FlexItemEditFragment {
-            val fragment = FlexItemEditFragment()
-            val args = Bundle()
-            args.putParcelable(FLEX_ITEM_KEY, flexItem)
-            args.putInt(VIEW_INDEX_KEY, viewIndex)
-            fragment.arguments = args
-            return fragment
+        fun newInstance(flexItem: FlexItem, viewIndex: Int) = FlexItemEditFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(FLEX_ITEM_KEY, flexItem)
+                putInt(VIEW_INDEX_KEY, viewIndex)
+            }
         }
     }
 }