diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
index 7aaaae1da..482514e2a 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
@@ -248,7 +248,7 @@ class EditHabitActivity : AppCompatActivity() {
             dialog.setListener { days: WeekdayList ->
                 reminderDays = days
                 if (reminderDays.isEmpty) reminderDays = WeekdayList.EVERY_DAY
-                if (isSkipDays) reminderDays = WeekdayList(reminderDays.toArray(),listSkipDays.toArray())
+                if (isSkipDays) reminderDays = WeekdayList(reminderDays.toArray(), listSkipDays.toArray())
                 populateReminder()
             }
             dialog.setSelectedDays(reminderDays)
@@ -264,7 +264,7 @@ class EditHabitActivity : AppCompatActivity() {
                 if (listSkipDays.isEmpty) listSkipDays = WeekdayList.NO_DAY
                 isSkipDays = (listSkipDays != WeekdayList.NO_DAY)
                 if (reminderHour >= 0 && isSkipDays) {
-                    reminderDays = WeekdayList(reminderDays.toArray(),listSkipDays.toArray())
+                    reminderDays = WeekdayList(reminderDays.toArray(), listSkipDays.toArray())
                     populateReminder()
                 }
                 populateSkipDays()
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
index fa5fe7e9f..12ba3dd2a 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
@@ -355,7 +355,7 @@ fun List<Entry>.countSkippedDays(
     firstWeekday: Int = Calendar.SATURDAY,
     skipDays: SkipDays
 ): List<Entry> {
-    val thisIntervalStart =  DateUtils.getTodayWithOffset().truncate(truncateField, firstWeekday)
+    val thisIntervalStart = DateUtils.getTodayWithOffset().truncate(truncateField, firstWeekday)
     return this.map { (timestamp, value) ->
         if (value == SKIP || skipDays.isDaySkipped(timestamp)) {
             Entry(timestamp, 1)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt
index 64ee3287f..b8673211a 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt
@@ -20,7 +20,7 @@ package org.isoron.uhabits.core.models
 
 data class Frequency(
     var numerator: Int,
-    var denominator: Int,
+    var denominator: Int
 ) {
     init {
         if (numerator == denominator) {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
index 5a87695b7..132250754 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
@@ -25,7 +25,7 @@ data class Habit(
     var color: PaletteColor = PaletteColor(8),
     var description: String = "",
     var frequency: Frequency = Frequency.DAILY,
-    var skipDays:  SkipDays = SkipDays.NONE,
+    var skipDays: SkipDays = SkipDays.NONE,
     var id: Long? = null,
     var isArchived: Boolean = false,
     var name: String = "",
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/SkipDays.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/SkipDays.kt
index 6815c700e..4d386fe59 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/SkipDays.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/SkipDays.kt
@@ -38,4 +38,4 @@ data class SkipDays(
         @JvmField
         val NONE = SkipDays(false, WeekdayList(0))
     }
-}
\ No newline at end of file
+}
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt
index 895ff8f0d..824234ad2 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt
@@ -26,7 +26,6 @@ import org.isoron.uhabits.core.models.EntryList
 import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.SkipDays
 import org.isoron.uhabits.core.models.Timestamp
-import org.isoron.uhabits.core.models.WeekdayList
 import org.isoron.uhabits.core.models.sqlite.records.EntryRecord
 
 class SQLiteEntryList(database: Database) : EntryList() {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt
index 3ff074424..43a240dc6 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt
@@ -58,7 +58,7 @@ class TargetCardPresenter {
 
             val skippedDayToday = entriesForSkip.countSkippedDays(
                 truncateField = DateUtils.TruncateField.DAY,
-                skipDays = habit.skipDays,
+                skipDays = habit.skipDays
             ).firstOrNull()?.value ?: 0
 
             val valueThisWeek = entriesForSum.groupedSum(
@@ -70,7 +70,7 @@ class TargetCardPresenter {
             val skippedDaysThisWeek = entriesForSkip.countSkippedDays(
                 truncateField = DateUtils.TruncateField.WEEK_NUMBER,
                 firstWeekday = firstWeekday,
-                skipDays = habit.skipDays,
+                skipDays = habit.skipDays
             ).firstOrNull()?.value ?: 0
 
             val valueThisMonth = entriesForSum.groupedSum(
@@ -80,7 +80,7 @@ class TargetCardPresenter {
 
             val skippedDaysThisMonth = entriesForSkip.countSkippedDays(
                 truncateField = DateUtils.TruncateField.MONTH,
-                skipDays = habit.skipDays,
+                skipDays = habit.skipDays
             ).firstOrNull()?.value ?: 0
 
             val valueThisQuarter = entriesForSum.groupedSum(
@@ -90,7 +90,7 @@ class TargetCardPresenter {
 
             val skippedDaysThisQuarter = entriesForSkip.countSkippedDays(
                 truncateField = DateUtils.TruncateField.QUARTER,
-                skipDays = habit.skipDays,
+                skipDays = habit.skipDays
             ).firstOrNull()?.value ?: 0
 
             val valueThisYear = entriesForSum.groupedSum(
@@ -100,7 +100,7 @@ class TargetCardPresenter {
 
             val skippedDaysThisYear = entriesForSkip.countSkippedDays(
                 truncateField = DateUtils.TruncateField.YEAR,
-                skipDays = habit.skipDays,
+                skipDays = habit.skipDays
             ).firstOrNull()?.value ?: 0
 
             val cal = DateUtils.getStartOfTodayCalendarWithOffset()