diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index 010f35bc3..2567df993 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -87,6 +87,7 @@ import org.schabi.newpipe.util.urlfinder.UrlFinder;
 import org.schabi.newpipe.views.FocusOverlayView;
 
 import java.io.Serializable;
+import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -748,7 +749,7 @@ public class RouterActivity extends AppCompatActivity {
          */
         private Optional<AppCompatActivity> getActivityContext() {
             return Optional.ofNullable(weakContext)
-                    .flatMap(context -> Optional.ofNullable(context.get()))
+                    .map(Reference::get)
                     .filter(context -> !context.isFinishing());
         }
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 1fb6b5859..601135cbb 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1887,7 +1887,7 @@ public final class VideoDetailFragment
         setupBrightness();
         if (!isPlayerAndPlayerServiceAvailable()
                 || player.UIs().get(MainPlayerUi.class).isEmpty()
-                || getRoot().flatMap(v -> Optional.ofNullable(v.getParent())).isEmpty()) {
+                || getRoot().map(View::getParent).isEmpty()) {
             return;
         }
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java
index 4f808caac..f08086287 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java
@@ -62,8 +62,8 @@ public interface MediaItemTag {
     @NonNull
     static Optional<MediaItemTag> from(@Nullable final MediaItem mediaItem) {
         return Optional.ofNullable(mediaItem)
-                .flatMap(item -> Optional.ofNullable(item.localConfiguration))
-                .flatMap(localConfiguration -> Optional.ofNullable(localConfiguration.tag))
+                .map(item -> item.localConfiguration)
+                .map(localConfiguration -> localConfiguration.tag)
                 .filter(MediaItemTag.class::isInstance)
                 .map(MediaItemTag.class::cast);
     }