diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/DozeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/DozeFragment.java
index 38376b2a9..68dc24345 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/DozeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/DozeFragment.java
@@ -40,12 +40,7 @@ public class DozeFragment extends SetupFragment {
 		dozeButton = (Button) v.findViewById(R.id.dozeButton);
 		progressBar = (ProgressBar) v.findViewById(R.id.progress);
 
-		dozeButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				askForDozeWhitelisting();
-			}
-		});
+		dozeButton.setOnClickListener(view -> askForDozeWhitelisting());
 
 		return v;
 	}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
index 96ea253f8..cf75077fe 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
@@ -25,6 +25,6 @@ public interface SetupController {
 
 	void createAccount();
 
-	void createAccount(final ResultHandler<Void> resultHandler);
+	void createAccount(ResultHandler<Void> resultHandler);
 
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
index 731cae02a..4d1f7ee73 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
@@ -70,7 +70,7 @@ public class SetupControllerImpl extends PasswordControllerImpl
 
 	@Override
 	public void createAccount() {
-		final UiResultHandler<Void> resultHandler =
+		UiResultHandler<Void> resultHandler =
 				new UiResultHandler<Void>(setupActivity) {
 					@Override
 					public void onResultUi(Void result) {
@@ -83,7 +83,7 @@ public class SetupControllerImpl extends PasswordControllerImpl
 	}
 
 	@Override
-	public void createAccount(final ResultHandler<Void> resultHandler) {
+	public void createAccount(ResultHandler<Void> resultHandler) {
 		if (authorName == null || password == null)
 			throw new IllegalStateException();
 		cryptoExecutor.execute(() -> {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java
index 911a96da2..f1a844caf 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java
@@ -230,8 +230,8 @@ class GroupControllerImpl extends
 	}
 
 	@Override
-	public void isDissolved(final
-	ResultExceptionHandler<Boolean, DbException> handler) {
+	public void isDissolved(
+			ResultExceptionHandler<Boolean, DbException> handler) {
 		runOnDbThread(() -> {
 			try {
 				boolean isDissolved =
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordControllerImplTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordControllerImplTest.java
index 34ad19fc5..9fee37d70 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordControllerImplTest.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordControllerImplTest.java
@@ -7,7 +7,6 @@ import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
-import org.briarproject.briar.android.controller.handler.ResultHandler;
 import org.jmock.Expectations;
 import org.junit.Test;
 
@@ -61,14 +60,8 @@ public class PasswordControllerImplTest extends BrambleMockTestCase {
 		PasswordControllerImpl p = new PasswordControllerImpl(briarPrefs,
 				databaseConfig, cryptoExecutor, crypto, estimator);
 
-		final AtomicBoolean capturedResult = new AtomicBoolean(false);
-		p.changePassword(oldPassword, newPassword,
-				new ResultHandler<Boolean>() {
-					@Override
-					public void onResult(Boolean result) {
-						capturedResult.set(result);
-					}
-				});
+		AtomicBoolean capturedResult = new AtomicBoolean(false);
+		p.changePassword(oldPassword, newPassword, capturedResult::set);
 		assertTrue(capturedResult.get());
 	}
 
@@ -86,14 +79,8 @@ public class PasswordControllerImplTest extends BrambleMockTestCase {
 		PasswordControllerImpl p = new PasswordControllerImpl(briarPrefs,
 				databaseConfig, cryptoExecutor, crypto, estimator);
 
-		final AtomicBoolean capturedResult = new AtomicBoolean(true);
-		p.changePassword(oldPassword, newPassword,
-				new ResultHandler<Boolean>() {
-					@Override
-					public void onResult(Boolean result) {
-						capturedResult.set(result);
-					}
-				});
+		AtomicBoolean capturedResult = new AtomicBoolean(true);
+		p.changePassword(oldPassword, newPassword, capturedResult::set);
 		assertFalse(capturedResult.get());
 	}
 }
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java
index f181e2881..9dbfd17af 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/login/SetupControllerImplTest.java
@@ -8,7 +8,6 @@ import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
-import org.briarproject.briar.android.controller.handler.ResultHandler;
 import org.jmock.Expectations;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Test;
@@ -72,15 +71,10 @@ public class SetupControllerImplTest extends BrambleMockTestCase {
 				databaseConfig, cryptoExecutor, crypto, estimator);
 		s.setSetupActivity(setupActivity);
 
-		final AtomicBoolean called = new AtomicBoolean(false);
+		AtomicBoolean called = new AtomicBoolean(false);
 		s.setAuthorName(authorName);
 		s.setPassword(password);
-		s.createAccount(new ResultHandler<Void>() {
-			@Override
-			public void onResult(Void result) {
-				called.set(true);
-			}
-		});
+		s.createAccount(result -> called.set(true));
 		assertTrue(called.get());
 	}
 }