diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/PermissionRationaleFragment.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/PermissionRationaleFragment.java
index 6b1c5c1a..b1418c5e 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/PermissionRationaleFragment.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/PermissionRationaleFragment.java
@@ -36,7 +36,7 @@ public class PermissionRationaleFragment extends DialogFragment {
 	private PermissionDialogListener mListener;
 
 	public interface PermissionDialogListener {
-		public void onRequestPermission(final String permission);
+		void onRequestPermission(final String permission);
 	}
 
 	@Override
@@ -74,11 +74,6 @@ public class PermissionRationaleFragment extends DialogFragment {
 		final StringBuilder text = new StringBuilder(getString(args.getInt(ARG_TEXT)));
 		return new AlertDialog.Builder(getActivity()).setTitle(R.string.permission_title).setMessage(text)
 				.setNegativeButton(R.string.cancel, null)
-				.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(final DialogInterface dialog, final int which) {
-						mListener.onRequestPermission(args.getString(ARG_PERMISSION));
-					}
-				}).create();
+				.setPositiveButton(R.string.ok, (dialog, which) -> mListener.onRequestPermission(args.getString(ARG_PERMISSION))).create();
 	}
 }
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
index b7014f8f..9ed4fbe2 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
@@ -251,7 +251,7 @@ public class UARTActivity extends BleProfileServiceReadyActivity<UARTService.UAR
 	protected void onViewCreated(final Bundle savedInstanceState) {
 		getSupportActionBar().setDisplayShowTitleEnabled(false);
 
-		final ClosableSpinner configurationSpinner = mConfigurationSpinner = (ClosableSpinner) findViewById(R.id.toolbar_spinner);
+		final ClosableSpinner configurationSpinner = mConfigurationSpinner = findViewById(R.id.toolbar_spinner);
 		configurationSpinner.setOnItemSelectedListener(this);
 		configurationSpinner.setAdapter(mConfigurationsAdapter);
 		configurationSpinner.setSelection(mConfigurationsAdapter.getItemPosition(mPreferences.getLong(PREFS_CONFIGURATION, 0)));