diff --git a/todolist/core/src/main/java/todolist/json/TodoPersistence.java b/todolist/core/src/main/java/todolist/json/TodoPersistence.java
index 6fe1f80d967178a5bfd2fe7369fb8baec1942634..ba808c7e1e88378eabdc6382fad41a7e5a5661e7 100644
--- a/todolist/core/src/main/java/todolist/json/TodoPersistence.java
+++ b/todolist/core/src/main/java/todolist/json/TodoPersistence.java
@@ -12,7 +12,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.EnumSet;
 import java.util.Set;
-
 import todolist.core.TodoModel;
 import todolist.json.internal.TodoModule;
 
@@ -22,6 +21,9 @@ import todolist.json.internal.TodoModule;
  */
 public class TodoPersistence {
 
+  /**
+   * Used to indicate what parts of a TodoModel to serialize.
+   */
   public enum TodoModelParts {
     SETTINGS, LISTS, LIST_CONTENTS
   }
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java b/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java
index da847fbe0e9525f415f15ce100a3d5f401cdadf4..cfaf8182d8fc652cfdfa4c700f846d37922a2fc2 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java
@@ -4,9 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import java.io.IOException;
-import java.util.EnumSet;
 import java.util.Set;
-
 import todolist.core.AbstractTodoList;
 import todolist.core.TodoModel;
 import todolist.json.TodoPersistence.TodoModelParts;
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoModule.java b/todolist/core/src/main/java/todolist/json/internal/TodoModule.java
index 96101cfa345440cc26381b76ab9b2eb8f35d1c19..36f9032c9de1ab8d4a0b2bdb394e60f692e93ad5 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoModule.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoModule.java
@@ -1,10 +1,9 @@
 package todolist.json.internal;
 
-import java.util.EnumSet;
-import java.util.Set;
-
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.util.EnumSet;
+import java.util.Set;
 import todolist.core.AbstractTodoList;
 import todolist.core.TodoItem;
 import todolist.core.TodoModel;
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java
index f6aee4d415a3243fb3fc28a6ccc1516f95c2187f..1468450e6ab6b69c8b5080e2f9206eafb8e6c139 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java
@@ -23,12 +23,12 @@ class TodoSettingsDeserializer extends JsonDeserializer<TodoSettings> {
 
   TodoSettings deserialize(JsonNode jsonNode) {
     if (jsonNode instanceof ObjectNode) {
-      ObjectNode objectNode = (ObjectNode) jsonNode;
-      TodoSettings settings = new TodoSettings();
-      JsonNode todoItemsSortOrderNode = objectNode.get(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING);
+      var objectNode = (ObjectNode) jsonNode;
+      var settings = new TodoSettings();
+      var todoItemsSortOrderNode = objectNode.get(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING);
       if (todoItemsSortOrderNode instanceof TextNode) {
         try {
-          TodoItemsSortOrder sortOrder = TodoItemsSortOrder.valueOf(todoItemsSortOrderNode.asText());
+          var sortOrder = TodoItemsSortOrder.valueOf(todoItemsSortOrderNode.asText());
           settings.setTodoItemsSortOrder(sortOrder);
         } catch (IllegalArgumentException iae) {
           // ignore unknown sort order constant
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java
index 31bf770b4dd683de8d08f20b73760abf76b21cf9..8e0e1ade1ca94f9e8e3b030766c6a8ea82f91e1b 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java
@@ -17,7 +17,8 @@ class TodoSettingsSerializer extends JsonSerializer<TodoSettings> {
       SerializerProvider serializerProvider)
       throws IOException {
     jsonGen.writeStartObject();
-    jsonGen.writeStringField(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING, settings.getTodoItemsSortOrder().name());
+    var sortOrderName = settings.getTodoItemsSortOrder().name();
+    jsonGen.writeStringField(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING, sortOrderName);
     jsonGen.writeEndObject();
   }
 }