diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java
index e3167e4..3214d84 100644
--- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java
+++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java
@@ -24,12 +24,14 @@ public int processJob() {
       return 1;
     }
 
-    for (int i = input-1; i > 1; i--) {
+    for (int i = input - 1; i > 1; i--) {
       rtn *= i;
     }
 
     return rtn;
   }
 
+  public void deleteFile() { file.delete(); }
+
   public int getInput() { return this.input; }
 }
diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java
index c699133..bebb9de 100644
--- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java
+++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java
@@ -1,19 +1,16 @@
 package ca.uwaterloo.cs489.exercise2;
 
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
 import java.io.FileNotFoundException;
-
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 public class MainApp {
 
   private static Path getDirectory() throws IOException {
@@ -34,8 +31,16 @@ public static void main(String[] args) {
       // Iterate over all of the files in the directory, creating a job for each
       for (Path entry : ds) {
         Job job = new Job(entry.toFile());
-        logger.info(String.format("Job %d yields %d\n", job.getInput(), job.processJob()));
+        logger.info(String.format("Job %d yields %d\n", job.getInput(),
+                                  job.processJob()));
+        job.deleteFile();
+        logger.info(String.format("Deleted a processed job file.\n"));
       }
+
+      logger.info(String.format(
+          "All jobs have been processed. Deleting temporary directory.\n"));
+      Files.delete(dir);
+
     } catch (IOException e) {
       e.printStackTrace();
     }