diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java
index 350f5318b..979a8dd9e 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestStateMachine.java
@@ -195,7 +195,7 @@ public class TrackRecordingServiceTestStateMachine {
 
     @MediumTest
     @Test
-    public void cannotResume_non_existing_track() throws InterruptedException {
+    public void cannotResume_non_existing_track() {
         // given
         assertFalse(service.isRecording());
         assertEquals(TrackRecordingService.STATUS_DEFAULT, service.getRecordingStatusObservable().getValue());
diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java
index a6923e775..ac12925cb 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java
@@ -78,7 +78,7 @@ public class TrackStatisticsUpdaterTest {
 
         // when
         TrackStatisticsUpdater subject = new TrackStatisticsUpdater();
-        data.trackPoints.forEach(it -> subject.addTrackPoint(it));
+        data.trackPoints.forEach(subject::addTrackPoint);
 
         // then
         TrackStatistics statistics = subject.getTrackStatistics();
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
index e459b6811..12c8d4e4c 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
@@ -146,9 +146,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
             finish();
             return true;
         });
-        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> {
-            Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show();
-        });
+        viewBinding.trackRecordingFabAction.setOnClickListener((view) -> Toast.makeText(TrackRecordingActivity.this, getString(R.string.hold_to_stop), Toast.LENGTH_LONG).show());
 
         viewBinding.bottomAppBar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24);
         setSupportActionBar(viewBinding.bottomAppBar);
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
index c8d1c1f56..76dfb8bd7 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
@@ -77,10 +77,8 @@ public class StatisticsRecordingFragment extends Fragment {
         }
     };
 
-    private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> {
-        service.getRecordingDataObservable()
-                .observe(StatisticsRecordingFragment.this, this::onRecordingDataChanged);
-    };
+    private final TrackRecordingServiceConnection.Callback bindChangedCallback = (service, unused) -> service.getRecordingDataObservable()
+            .observe(StatisticsRecordingFragment.this, this::onRecordingDataChanged);
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
diff --git a/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java b/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java
index f234a25b3..bb921af4b 100644
--- a/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java
@@ -62,8 +62,8 @@ public class IntroductionActivity extends AbstractActivity {
     private static class CustomFragmentPagerAdapter extends FragmentStateAdapter {
 
         private static final List<FragmentCreator> fragmentCreators = List.of(
-                (FragmentCreator) WelcomeFragment::newInstance,
-                (FragmentCreator) OSMDashboardFragment::newInstance
+                WelcomeFragment::newInstance,
+                OSMDashboardFragment::newInstance
         );
 
         public CustomFragmentPagerAdapter(@NonNull FragmentActivity fa) {
diff --git a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java
index ca03446eb..984ee19ed 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java
@@ -73,9 +73,7 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat {
 
     private void setFilenameTemplate() {
         EditTextPreference preference = findPreference(getString(R.string.export_filename_format_key));
-        preference.setOnBindEditTextListener(t -> {
-            t.setHint(getString(R.string.export_filename_format_default));
-        });
+        preference.setOnBindEditTextListener(t -> t.setHint(getString(R.string.export_filename_format_default)));
         preference.setDialogMessage(TrackFilenameGenerator.getAllOptions());
 
         preference.setOnPreferenceChangeListener((p, newValue) -> new TrackFilenameGenerator(newValue.toString()).isValid());
diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java
index 8b309ac05..2bd1c892e 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.java
@@ -131,7 +131,7 @@ public class IntervalStatisticsModel extends AndroidViewModel {
         OPTION_20(20),
         OPTION_50(50);
 
-        static IntervalOption DEFAULT = OPTION_1;
+        static final IntervalOption DEFAULT = OPTION_1;
 
         private final double multiplier;