diff --git a/src/main/java/duke/DialogBox.java b/src/main/java/duke/DialogBox.java
index 1286339296..578af69b6a 100644
--- a/src/main/java/duke/DialogBox.java
+++ b/src/main/java/duke/DialogBox.java
@@ -16,8 +16,9 @@
 
 /**
  * An example of a custom control using FXML.
- * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
- * containing text from the speaker.
+ * This control represents a dialog box consisting of an ImageView
+ * to represent the speaker's face and a label containing text
+ * from the speaker.
  */
 public class DialogBox extends HBox {
     @FXML
@@ -27,7 +28,8 @@ public class DialogBox extends HBox {
 
     private DialogBox(String text, Image img) {
         try {
-            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml"));
+            FXMLLoader fxmlLoader = new FXMLLoader(
+                    MainWindow.class.getResource("/view/DialogBox.fxml"));
             fxmlLoader.setController(this);
             fxmlLoader.setRoot(this);
             fxmlLoader.load();
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index c1d1e653e9..ba21f47336 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -64,15 +64,22 @@ public static Task parseNewTask(String userInput) throws MissingInputException {
 
         switch (taskType) {
         case TODO:
-            return new ToDo(userInputScanner.nextLine().trim());
+            String todoName = userInputScanner.nextLine().trim();
+            return new ToDo(todoName);
         case DEADLINE:
             userInputScanner.useDelimiter(" /by ");
-            return new Deadline(userInputScanner.next().trim(),
-                    LocalDate.parse(userInputScanner.next().trim()));
+            String deadlineName = userInputScanner.next().trim();
+            LocalDate deadlineDateTime =
+                    LocalDate.parse(userInputScanner.next().trim());
+
+            return new Deadline(deadlineName, deadlineDateTime);
         case EVENT:
             userInputScanner.useDelimiter(" /at ");
-            return new Event(userInputScanner.next().trim(),
-                    LocalDate.parse(userInputScanner.next().trim()));
+            String eventName = userInputScanner.next().trim();
+            LocalDate eventDateTime =
+                    LocalDate.parse(userInputScanner.next().trim());
+
+            return new Event(eventName, eventDateTime);
         default:
             return null; // Error
         }
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index daa1a25bf3..627bbd519d 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -54,10 +54,11 @@ private ArrayList<Task> loadTasks(Path savePath) {
         try (BufferedReader reader = Files.newBufferedReader(savePath)) {
 
             ArrayList<Task> tasks = new ArrayList<>();
-            String line = null;
+            String line = reader.readLine();
 
-            while ((line = reader.readLine()) != null) {
+            while (line != null) {
                 tasks.add(loadTask(line));
+                line = reader.readLine();
             }
 
             return tasks;
@@ -76,18 +77,18 @@ private Task loadTask(String savedTask) {
 
         switch (taskType) {
         case "T":
-            loadedTask = new ToDo(taskDesc, isTaskDone));
+            loadedTask = new ToDo(taskDesc, isTaskDone);
             break;
         case "D":
-            loadedTask = new Deadline(taskDesc,
-                    LocalDate.parse(saveDataScanner.next()), isTaskDone);
+            LocalDate deadlineDateTime = LocalDate.parse(saveDataScanner.next());
+            loadedTask = new Deadline(taskDesc, deadlineDateTime, isTaskDone);
             break;
         case "E":
-            loadedTask = new Event(taskDesc,
-                    LocalDate.parse(saveDataScanner.next()), isTaskDone);
+            LocalDate eventDateTime = LocalDate.parse(saveDataScanner.next());
+            loadedTask = new Event(taskDesc, eventDateTime, isTaskDone);
             break;
         default:
-            break; //Error
+            break; // Error
         }
         saveDataScanner.close();