diff --git a/android/uhabits-android/src/main/AndroidManifest.xml b/android/uhabits-android/src/main/AndroidManifest.xml
index 2b5e7e17f..b0580e927 100644
--- a/android/uhabits-android/src/main/AndroidManifest.xml
+++ b/android/uhabits-android/src/main/AndroidManifest.xml
@@ -18,8 +18,7 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.isoron.uhabits"
-    >
+    package="org.isoron.uhabits">
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
index eeae1e7d4..7d3f64378 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt
@@ -23,9 +23,7 @@ import android.content.*
 class CheckmarkWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) {
-            CheckmarkWidget(context, id, habits[0])
-        }
-        else StackWidget(context, id, StackWidgetType.CHECKMARK, habits)
+        if (habits.size == 1) return CheckmarkWidget(context, id, habits[0])
+        else return StackWidget(context, id, StackWidgetType.CHECKMARK, habits)
     }
 }
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
index 69e989776..a1c5b51ad 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
@@ -61,7 +61,9 @@ public class ListHabitsMenuBehavior
         updateAdapterFilter();
     }
 
-    public void onCreateHabit() { screen.showSelectHabitTypeDialog(); }
+    public void onCreateHabit() {
+        screen.showSelectHabitTypeDialog();
+    }
 
     public void onViewFAQ()
     {
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
index bd7241e30..1bee93a49 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
@@ -79,13 +79,13 @@ public class WidgetBehavior
 
     private void performToggle(@NonNull Habit habit, Timestamp timestamp)
     {
-        getCommandRunner().execute(
-            new ToggleRepetitionCommand(getHabitList(), habit, timestamp),
+        commandRunner.execute(
+            new ToggleRepetitionCommand(habitList, habit, timestamp),
             habit.getId());
     }
 
     public void setNumericValue(@NonNull Habit habit, Timestamp timestamp, int newValue) {
-        getCommandRunner().execute(
+        commandRunner.execute(
                 new CreateRepetitionCommand(habit, timestamp, newValue),
                 habit.getId());
     }