diff --git a/src/main/java/seedu/address/logic/parser/AddTaskCommandParser.java b/src/main/java/seedu/address/logic/parser/AddTaskCommandParser.java
index 3312674480b..621d8f321a3 100644
--- a/src/main/java/seedu/address/logic/parser/AddTaskCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddTaskCommandParser.java
@@ -13,7 +13,6 @@
 
 import seedu.address.logic.commands.AddTaskCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.event.exceptions.InvalidDescriptionException;
 import seedu.address.model.task.Task;
 
 /**
diff --git a/src/main/java/seedu/address/model/task/Task.java b/src/main/java/seedu/address/model/task/Task.java
index 9301957cb19..823f241f1b2 100644
--- a/src/main/java/seedu/address/model/task/Task.java
+++ b/src/main/java/seedu/address/model/task/Task.java
@@ -8,7 +8,6 @@
 import java.util.Comparator;
 
 import seedu.address.commons.util.ToStringBuilder;
-import seedu.address.model.event.exceptions.InvalidDescriptionException;
 
 /**
  * Represents a task in the task list.
diff --git a/src/main/java/seedu/address/model/task/TaskList.java b/src/main/java/seedu/address/model/task/TaskList.java
index 5d733371058..bdeb6d3e7e9 100644
--- a/src/main/java/seedu/address/model/task/TaskList.java
+++ b/src/main/java/seedu/address/model/task/TaskList.java
@@ -53,6 +53,9 @@ public void remove(Task toRemove) {
         }
     }
 
+    /**
+     * Removes a task at specified index from the list and returns the removed task.
+     */
     public Task remove(int index) {
         requireNonNull(index);
 
diff --git a/src/test/java/seedu/address/logic/commands/AddTaskCommandTest.java b/src/test/java/seedu/address/logic/commands/AddTaskCommandTest.java
index 2a373d2a3c7..921f8561fab 100644
--- a/src/test/java/seedu/address/logic/commands/AddTaskCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/AddTaskCommandTest.java
@@ -1,7 +1,9 @@
 package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_END_DATE_LATER;
 import static seedu.address.testutil.Assert.assertThrows;
 
@@ -13,8 +15,9 @@
 import java.util.List;
 import java.util.function.Predicate;
 
-import javafx.collections.ObservableList;
 import org.junit.jupiter.api.Test;
+
+import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.logic.Messages;
 import seedu.address.logic.commands.exceptions.CommandException;
@@ -270,4 +273,4 @@ public void addTask(Task task) {
             tasksAdded.add(task);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/seedu/address/model/task/DeadlineTest.java b/src/test/java/seedu/address/model/task/DeadlineTest.java
index abc194408c8..76e9c7219a5 100644
--- a/src/test/java/seedu/address/model/task/DeadlineTest.java
+++ b/src/test/java/seedu/address/model/task/DeadlineTest.java
@@ -12,6 +12,7 @@
 import java.time.format.DateTimeFormatter;
 
 import org.junit.jupiter.api.Test;
+
 import seedu.address.model.event.exceptions.InvalidDeadlineException;
 
 class DeadlineTest {
diff --git a/src/test/java/seedu/address/model/task/TaskDescriptionTest.java b/src/test/java/seedu/address/model/task/TaskDescriptionTest.java
index 7e83507d196..7e08e6cb521 100644
--- a/src/test/java/seedu/address/model/task/TaskDescriptionTest.java
+++ b/src/test/java/seedu/address/model/task/TaskDescriptionTest.java
@@ -58,4 +58,4 @@ public void compareToTest() {
         assertEquals(-1, descriptionA.compareTo(descriptionB));
         assertEquals(0, descriptionA.compareTo(descriptionA));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/seedu/address/model/task/TaskListTest.java b/src/test/java/seedu/address/model/task/TaskListTest.java
index 87547571803..d8af3370daf 100644
--- a/src/test/java/seedu/address/model/task/TaskListTest.java
+++ b/src/test/java/seedu/address/model/task/TaskListTest.java
@@ -1,15 +1,5 @@
 package seedu.address.model.task;
 
-
-import org.junit.jupiter.api.Test;
-import seedu.address.model.person.UniquePersonList;
-import seedu.address.model.task.exceptions.DuplicateTaskException;
-import seedu.address.model.task.exceptions.TaskNotFoundException;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -17,6 +7,15 @@
 import static seedu.address.testutil.TypicalTasks.ASSIGNMENT;
 import static seedu.address.testutil.TypicalTasks.HYDRATION;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.task.exceptions.DuplicateTaskException;
+import seedu.address.model.task.exceptions.TaskNotFoundException;
+
 class TaskListTest {
     private final TaskList taskList = new TaskList();
 
diff --git a/src/test/java/seedu/address/model/task/TaskManagerTest.java b/src/test/java/seedu/address/model/task/TaskManagerTest.java
index bde81208a0f..277b0e2a8a1 100644
--- a/src/test/java/seedu/address/model/task/TaskManagerTest.java
+++ b/src/test/java/seedu/address/model/task/TaskManagerTest.java
@@ -1,12 +1,16 @@
 package seedu.address.model.task;
 
-import org.junit.jupiter.api.Test;
-import seedu.address.model.task.exceptions.DuplicateTaskException;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalTasks.ASSIGNMENT;
 import static seedu.address.testutil.TypicalTasks.HYDRATION;
 
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.task.exceptions.DuplicateTaskException;
+
 class TaskManagerTest {
     private final TaskManager taskManager = new TaskManager();
 
@@ -56,4 +60,4 @@ public void equalsMethod() {
 
         assertFalse(taskManager.equals(notTaskManager));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/seedu/address/model/task/TaskTest.java b/src/test/java/seedu/address/model/task/TaskTest.java
index 394d4a3e3fb..caa3313be36 100644
--- a/src/test/java/seedu/address/model/task/TaskTest.java
+++ b/src/test/java/seedu/address/model/task/TaskTest.java
@@ -1,10 +1,5 @@
 package seedu.address.model.task;
 
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-import java.util.Comparator;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -12,6 +7,11 @@
 import static seedu.address.model.task.Task.DATE_TIME_STRING_FORMATTER;
 import static seedu.address.testutil.Assert.assertThrows;
 
+import java.time.LocalDateTime;
+import java.util.Comparator;
+
+import org.junit.jupiter.api.Test;
+
 class TaskTest {
     private static final String VALID_DESCRIPTION_STRING = "Eat Nuts";
     private static final TaskDescription VALID_TASK_DESCRIPTION = new TaskDescription(VALID_DESCRIPTION_STRING);