diff --git a/briar-android/src/org/briarproject/android/blogs/BlogActivity.java b/briar-android/src/org/briarproject/android/blogs/BlogActivity.java
index 7519b46ab2c9d6b304085003d91a93d01cf4ebaf..cf38dce1ee91a1d1580da67319585883f2be5f59 100644
--- a/briar-android/src/org/briarproject/android/blogs/BlogActivity.java
+++ b/briar-android/src/org/briarproject/android/blogs/BlogActivity.java
@@ -136,8 +136,8 @@ public class BlogActivity extends BriarActivity implements BlogPostListener,
 
 	private void loadBlogPosts(final int position, final boolean setItem) {
 		showLoadingScreen();
-		blogController
-				.loadBlog(groupId, false, new UiResultHandler<Boolean>(this) {
+		blogController.loadBlog(groupId, false,
+				new UiResultHandler<Boolean>(this) {
 					@Override
 					public void onResultUi(Boolean result) {
 						if (result) {
diff --git a/briar-android/src/org/briarproject/android/blogs/FeedController.java b/briar-android/src/org/briarproject/android/blogs/FeedController.java
index ad98adeefed6788e8a9854921156ff4a1ee1de20..d449eb60be5f8f53c53549650fbfa11e3fa51f8b 100644
--- a/briar-android/src/org/briarproject/android/blogs/FeedController.java
+++ b/briar-android/src/org/briarproject/android/blogs/FeedController.java
@@ -1,7 +1,6 @@
 package org.briarproject.android.blogs;
 
-import org.briarproject.android.controller.ActivityLifecycleController;
-import org.briarproject.android.controller.handler.UiResultHandler;
+import org.briarproject.android.controller.handler.ResultHandler;
 import org.briarproject.api.blogs.Blog;
 
 import java.util.Collection;
@@ -9,12 +8,12 @@ import java.util.Collection;
 public interface FeedController {
 
 	void onResume();
+
 	void onPause();
 
-	void loadPosts(
-			final UiResultHandler<Collection<BlogPostItem>> resultHandler);
+	void loadPosts(ResultHandler<Collection<BlogPostItem>> resultHandler);
 
-	void loadPersonalBlog(final UiResultHandler<Blog> resultHandler);
+	void loadPersonalBlog(ResultHandler<Blog> resultHandler);
 
 	void setOnBlogPostAddedListener(OnBlogPostAddedListener listener);
 
diff --git a/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java b/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java
index 4e22757f675d4843de4fdcd4c9196f0804d82b81..1cc49a3e1206224ab28903811efd698fffa75f86 100644
--- a/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java
+++ b/briar-android/src/org/briarproject/android/blogs/FeedControllerImpl.java
@@ -1,7 +1,7 @@
 package org.briarproject.android.blogs;
 
 import org.briarproject.android.controller.DbControllerImpl;
-import org.briarproject.android.controller.handler.UiResultHandler;
+import org.briarproject.android.controller.handler.ResultHandler;
 import org.briarproject.api.blogs.Blog;
 import org.briarproject.api.blogs.BlogManager;
 import org.briarproject.api.blogs.BlogPostHeader;
@@ -41,10 +41,12 @@ public class FeedControllerImpl extends DbControllerImpl
 	FeedControllerImpl() {
 	}
 
+	@Override
 	public void onResume() {
 		eventBus.addListener(this);
 	}
 
+	@Override
 	public void onPause() {
 		eventBus.removeListener(this);
 	}
@@ -70,7 +72,7 @@ public class FeedControllerImpl extends DbControllerImpl
 
 	@Override
 	public void loadPosts(
-			final UiResultHandler<Collection<BlogPostItem>> resultHandler) {
+			final ResultHandler<Collection<BlogPostItem>> resultHandler) {
 
 		LOG.info("Loading blog posts...");
 		runOnDbThread(new Runnable() {
@@ -102,7 +104,7 @@ public class FeedControllerImpl extends DbControllerImpl
 	}
 
 	@Override
-	public void loadPersonalBlog(final UiResultHandler<Blog> resultHandler) {
+	public void loadPersonalBlog(final ResultHandler<Blog> resultHandler) {
 		LOG.info("Loading personal blog...");
 		runOnDbThread(new Runnable() {
 			@Override
diff --git a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java
index bc7a1e457664384eeb5c5c76562c3981f9432f19..f875dd5c2c1e9c081b06bec03a7e71c1c0f6a967 100644
--- a/briar-android/src/org/briarproject/android/blogs/FeedFragment.java
+++ b/briar-android/src/org/briarproject/android/blogs/FeedFragment.java
@@ -94,8 +94,8 @@ public class FeedFragment extends BaseFragment implements
 	@Override
 	public void onStart() {
 		super.onStart();
-		feedController
-				.loadPersonalBlog(new UiResultHandler<Blog>(getActivity()) {
+		feedController.loadPersonalBlog(
+				new UiResultHandler<Blog>(getActivity()) {
 					@Override
 					public void onResultUi(Blog b) {
 						personalBlog = b;
diff --git a/briar-android/src/org/briarproject/android/controller/NavDrawerController.java b/briar-android/src/org/briarproject/android/controller/NavDrawerController.java
index a2f339990f0bf8915c885822d287c599394c0e78..8cd8aa86067f3d76565bdc06af7af767054d7ff9 100644
--- a/briar-android/src/org/briarproject/android/controller/NavDrawerController.java
+++ b/briar-android/src/org/briarproject/android/controller/NavDrawerController.java
@@ -1,6 +1,6 @@
 package org.briarproject.android.controller;
 
-import org.briarproject.android.controller.handler.UiResultHandler;
+import org.briarproject.android.controller.handler.ResultHandler;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.identity.LocalAuthor;
 
@@ -11,7 +11,7 @@ public interface NavDrawerController extends ActivityLifecycleController {
 	boolean isTransportRunning(TransportId transportId);
 
 	void storeLocalAuthor(LocalAuthor author,
-			UiResultHandler<Void> resultHandler);
+			ResultHandler<Void> resultHandler);
 
 	LocalAuthor removeAuthorHandle(long handle);
 }
diff --git a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java b/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java
index 7ca4fe4758440d7bd6c4664ce817e369979a9db5..23a680bd39ffdb5c968dc1b8041683e0cdd825cd 100644
--- a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java
+++ b/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java
@@ -3,7 +3,7 @@ package org.briarproject.android.controller;
 import android.app.Activity;
 
 import org.briarproject.android.api.ReferenceManager;
-import org.briarproject.android.controller.handler.UiResultHandler;
+import org.briarproject.android.controller.handler.ResultHandler;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.event.Event;
@@ -111,7 +111,7 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 
 	@Override
 	public void storeLocalAuthor(final LocalAuthor author,
-			final UiResultHandler<Void> resultHandler) {
+			final ResultHandler<Void> resultHandler) {
 		runOnDbThread(new Runnable() {
 			@Override
 			public void run() {
diff --git a/briar-android/src/org/briarproject/android/forum/ForumActivity.java b/briar-android/src/org/briarproject/android/forum/ForumActivity.java
index f6a0c597f583591fa249157d91f12f8f36bfc13b..dec9c69847111484b8dfb41dfaebb712cbfbe3e2 100644
--- a/briar-android/src/org/briarproject/android/forum/ForumActivity.java
+++ b/briar-android/src/org/briarproject/android/forum/ForumActivity.java
@@ -46,7 +46,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
@@ -63,9 +62,6 @@ import static android.widget.Toast.LENGTH_SHORT;
 public class ForumActivity extends BriarActivity implements
 		ForumController.ForumPostListener {
 
-	private static final Logger LOG =
-			Logger.getLogger(ForumActivity.class.getName());
-
 	static final String FORUM_NAME = "briar.FORUM_NAME";
 	private static final int REQUEST_FORUM_SHARED = 3;
 
@@ -113,8 +109,8 @@ public class ForumActivity extends BriarActivity implements
 		recyclerView.setEmptyText(getString(R.string.no_forum_posts));
 		recyclerView.showProgressBar();
 
-		forumController
-				.loadForum(groupId, new UiResultHandler<Boolean>(this) {
+		forumController.loadForum(groupId,
+				new UiResultHandler<Boolean>(this) {
 					@Override
 					public void onResultUi(Boolean result) {
 						if (result) {
@@ -436,7 +432,7 @@ public class ForumActivity extends BriarActivity implements
 		private boolean hasVisibleDescendants(ForumEntry forumEntry) {
 			int visiblePos = getVisiblePos(forumEntry);
 			int levelLimit = forumEntry.getLevel();
-			// TODO This loop doesn't really loop. @ernir please review!
+			// FIXME This loop doesn't really loop. @ernir please review!
 			for (int i = visiblePos + 1; i < getItemCount(); i++) {
 				ForumEntry entry = getVisibleEntry(i);
 				if (entry != null && entry.getLevel() <= levelLimit)