diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000000..4c001417ae
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file enforces rules for a modified version of the module's code standard at
+    https://oss-generic.github.io/process/codingstandards/coding-standards-java.html
+-->
+
+<module name="Checker">
+
+  <module name="FileTabCharacter">
+    <!-- Checks that there are no tab characters in the file. -->
+  </module>
+
+  <module name="NewlineAtEndOfFile">
+    <!-- Accept LF, CR or CRLF to accomodate devs who prefer different line endings -->
+    <property name="lineSeparator" value="lf_cr_crlf"/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <!-- Checks that FIXME is not used in comments.  TODO is preferred. -->
+    <property name="format" value="((//.*)|(\*.*))FIXME" />
+    <property name="message" value='TODO is preferred to FIXME."' />
+  </module>
+
+  <module name="SuppressionFilter">
+    <property name="file" value="${config_loc}/suppressions.xml"/>
+  </module>
+
+  <module name="LineLength">
+    <!-- Checks if a line is too long. -->
+    <property name="max" value="120"/>
+  </module>
+
+  <!-- All Java AST specific tests live under TreeWalker module. -->
+  <module name="TreeWalker">
+
+    <!-- Required to allow exceptions in code style -->
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+      <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
+
+    <!--
+    IMPORT CHECKS
+    -->
+
+    <!-- Checks the ordering of import statements follow the rules that the default Eclipse formatter uses.
+    The order rule "STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE" consists of:
+      1. STATIC: static imports
+      2. STANDARD_JAVA_PACKAGE: standard java/javax imports
+      3. SPECIAL_IMPORTS: defined as org imports
+      4. THIRD_PARTY_PACKAGE: defined as com imports
+    -->
+    <module name="CustomImportOrder">
+        <property name="customImportOrderRules"
+            value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+        <property name="specialImportsRegExp" value="^org\."/>
+        <property name="thirdPartyPackageRegExp" value="^com\."/>
+        <property name="sortImportsInGroupAlphabetically" value="true"/>
+    </module>
+
+    <!-- Checks for redundant import statements.
+    An import statement is redundant if:
+      * It is a duplicate of another import. This is, when a class is imported more than once.
+      * The class non-statically imported is from the java.lang package, e.g. importing java.lang.String.
+      * The class non-statically imported is from the same package as the current package.
+    -->
+    <module name="RedundantImport"/>
+
+    <!-- Checks for unused import statements.
+    An import statement is unused if:
+      It's not referenced in the file.
+    -->
+    <module name="UnusedImports"/>
+
+    <module name="AvoidStarImport"/>
+
+    <!--
+    NAMING CHECKS
+    -->
+
+    <!-- Validate abbreviations (consecutive capital letters) length in identifier name -->
+    <module name="AbbreviationAsWordInName">
+      <property name="ignoreFinal" value="false"/>
+      <property name="allowedAbbreviationLength" value="1"/>
+    </module>
+
+    <module name="PackageName">
+      <!-- Validates identifiers for package names against the supplied expression. -->
+      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,})*$"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="TypeName">
+      <!-- Validates static, final fields against the expression "^[A-Z][a-zA-Z0-9]*$". -->
+      <metadata name="altname" value="TypeName"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="ConstantName">
+      <!-- Validates non-private, static, final fields against the expression "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
+      <metadata name="altname" value="ConstantName"/>
+      <property name="applyToPrivate" value="false"/>
+      <message key="name.invalidPattern"
+               value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="StaticVariableName">
+      <!-- Validates static, non-final fields against the supplied expression. -->
+      <metadata name="altname" value="StaticVariableName"/>
+      <property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="MemberName">
+      <!-- Validates non-static members against the supplied expression. -->
+      <metadata name="altname" value="MemberName"/>
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="MethodName">
+      <!-- Validates identifiers for method names against the supplied expression. -->
+      <metadata name="altname" value="MethodName"/>
+      <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-z][a-zA-Z0-9]+){0,2}$"/>
+    </module>
+
+    <module name="ParameterName">
+      <!-- Validates identifiers for method parameters against the expression "^[a-z][a-zA-Z0-9]*$". -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="LocalFinalVariableName">
+      <!-- Validates identifiers for local final variables against the expression "^[a-z][a-zA-Z0-9]*$". -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="LocalVariableName">
+      <!-- Validates identifiers for local variables against the expression "^[a-z][a-zA-Z0-9]*$". -->
+      <property name="severity" value="warning"/>
+    </module>
+
+
+    <!--
+    LENGTH and CODING CHECKS
+    -->
+
+    <!-- Checks that array type declarations follow Java Style
+      Java style: public static void main(String[] args) // Allowed
+      C style:    public static void main(String args[]) // Not allowed
+    -->
+    <module name="ArrayTypeStyle"/>
+
+    <!-- Checks if a catch block is empty and does not contain any comments. -->
+    <module name="EmptyCatchBlock"/>
+
+    <module name="LeftCurly">
+      <!-- Checks for placement of the left curly brace ('{'). -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="RightCurly">
+      <!-- Checks right curlies on CATCH, ELSE, and TRY blocks are on
+      the same line. e.g., the following example is fine:
+      <pre>
+        if {
+          ...
+        } else
+      </pre>
+      -->
+      <!-- This next example is not fine:
+      <pre>
+        if {
+          ...
+        }
+        else
+      </pre>
+      -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <!-- Checks for braces around loop blocks -->
+    <module name="NeedBraces">
+      <!--
+      if (true) return 1; // Not allowed
+
+      if (true) { return 1; } // Not allowed
+
+      else if {
+        return 1; // else if should always be multi line
+      }
+
+      if (true)
+        return 1; // Not allowed
+      -->
+      <property name="allowEmptyLoopBody" value="true"/>
+    </module>
+
+    <!-- Checks that each variable declaration is in its own statement and on its own line. -->
+    <module name="MultipleVariableDeclarations"/>
+
+    <module name="OneStatementPerLine"/>
+
+    <!-- Checks that long constants are defined with an upper ell.-->
+    <module name="UpperEll" />
+
+    <module name="FallThrough">
+      <!-- Warn about falling through to the next case statement.  Similar to
+      javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
+      on the last non-blank line preceding the fallen-into case contains 'fall through' (or
+      some other variants which we don't publicized to promote consistency).
+      -->
+      <property name="reliefPattern"
+       value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
+    </module>
+
+    <module name="MissingSwitchDefault"/>
+
+    <!-- Checks that Class variables should never be declared public. -->
+    <module name="VisibilityModifier">
+      <property name="protectedAllowed" value="true"/>
+      <property name="allowPublicFinalFields" value="true"/>
+      <property name="ignoreAnnotationCanonicalNames" value="RegisterExtension, TempDir"/>
+    </module>
+
+    <!--
+    ORDER CHECKS
+    -->
+
+    <!-- Checks that the order of at-clauses follows the tagOrder default property value order.
+         @author, @version, @param, @return, @throws, @exception, @see, @since, @serial, @serialField, @serialData, @deprecated
+    -->
+    <module name="AtclauseOrder"/>
+
+    <!-- Checks if the Class and Interface declarations is organized in this order
+      1. Class (static) variables. Order: public, protected, package level (no access modifier), private.
+      2. Instance variables. Order: public, protected, package level (no access modifier), private.
+      3. Constructors
+      4. Methods
+    -->
+    <module name ="DeclarationOrder"/>
+
+    <module name="ModifierOrder">
+      <!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
+           8.4.3.  The prescribed order is:
+           public, protected, private, abstract, static, final, transient, volatile,
+           synchronized, native, strictfp
+        -->
+    </module>
+
+    <module name="OverloadMethodsDeclarationOrder"/>
+
+    <!--
+    WHITESPACE CHECKS
+    -->
+
+    <!-- Checks that comments are indented relative to their position in the code -->
+    <module name="CommentsIndentation"/>
+
+    <module name="WhitespaceAround">
+      <!-- Checks that various tokens are surrounded by whitespace.
+           This includes most binary operators and keywords followed
+           by regular or curly braces.
+      -->
+      <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
+        BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
+        EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
+        RCURLY, SL, SLIST, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+      <!-- Allow empty constructors e.g. MyClass() {} -->
+      <property name="allowEmptyConstructors" value="true" />
+      <!-- Allow empty methods e.g. void func() {} -->
+      <property name="allowEmptyMethods" value="true" />
+      <!-- Allow empty types e.g. class Foo {}, enum Foo {} -->
+      <property name="allowEmptyTypes" value="true" />
+      <!-- Allow empty loops e.g. for (int i = 1; i > 1; i++) {} -->
+      <property name="allowEmptyLoops" value="true" />
+      <!-- Allow empty lambdas e.g. () -> {} -->
+      <property name="allowEmptyLambdas" value="true" />
+    </module>
+
+    <module name="WhitespaceAfter">
+      <!-- Checks that commas, semicolons and typecasts are followed by whitespace. -->
+      <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+    </module>
+
+    <module name="NoWhitespaceAfter">
+      <!-- Checks that there is no whitespace after various unary operators. Linebreaks are allowed. -->
+      <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
+        UNARY_PLUS"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+
+    <!-- No trailing whitespace -->
+    <module name="Regexp">
+      <property name="format" value="[ \t]+$"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Trailing whitespace"/>
+    </module>
+
+    <module name="OperatorWrap">
+      <!-- Checks that the non-assignment type operator is at the next line in a line wrap.
+           This includes "?", ":", "==", "!=", "/", "+", "-", "*", "%", ">>", ">>>",
+           ">=", ">", "<<", "<=", "<", "^", "|", "||", "&", "&&", "instanceof",
+           "&" when used in a generic upper or lower bounds constraints,
+             e.g. <T extends Foo & Bar>
+           "::" when used as a reference to a method or constructor without arguments.
+             e.g. String::compareToIgnoreCase
+      -->
+      <property name="tokens" value="QUESTION, COLON, EQUAL, NOT_EQUAL, DIV, PLUS, MINUS, STAR, MOD, SR, BSR,
+        GE, GT, SL, LE, LT, BXOR, BOR, LOR, BAND, LAND, LITERAL_INSTANCEOF, TYPE_EXTENSION_AND, METHOD_REF"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="OperatorWrap">
+      <!-- Checks that the assignment type operator is at the previous end of line in a line wrap.
+           This includes "=", "/=", "+=", "-=", "*=", "%=", ">>=", ">>>=", "<<=", "^=", "&=".
+      -->
+      <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN,
+        SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
+      <property name="option" value="eol"/>
+    </module>
+
+    <module name="SeparatorWrap">
+      <!-- Checks that the ".", "@" is at the next line in a line wrap. -->
+      <property name="tokens" value="DOT, AT"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="SeparatorWrap">
+      <!-- Checks that the ",", "]", "[", "...", ";", "(" is at the previous end of line in a line wrap. -->
+      <property name="tokens" value="COMMA, RBRACK, ARRAY_DECLARATOR, ELLIPSIS, SEMI, LPAREN"/>
+      <property name="option" value="eol"/>
+    </module>
+
+    <module name="Indentation">
+      <property name="caseIndent" value="0" />
+    </module>
+
+    <module name="NoWhitespaceBefore">
+      <!-- Checks that there is no whitespace before various unary operators. Linebreaks are allowed. -->
+      <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+
+    <module name="ParenPad">
+      <!-- Checks that there is no whitespace before close parenthesis or after open parenthesis. -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <!-- Checks that non-whitespace characters are separated by no more than one whitespace character.
+         a = 1; // Allowed
+         a  = 1; // Not allowed (more than one space before =)
+    -->
+    <module name="SingleSpaceSeparator">
+      <!-- Validate whitespace surrounding comments as well.
+
+           a = 1; // Allowed (single space before start of comment)
+           a = 1; /* Allowed (single space before start of comment) */
+           /* Allowed (single space after end of comment) */ a = 1;
+           a = 1;  // Not allowed (more than one space before start of comment)
+           a = 1;  /* Not allowed (more than one space before start of comment) */
+           /* Not allowed (more than one space after end of comment) */  a = 1;
+
+           This doesn't validate whitespace within comments so a comment /* like  this */ is allowed.
+      -->
+      <property name="validateComments" value="true"/>
+    </module>
+
+    <!--
+    JAVADOC CHECKS
+    -->
+
+    <!-- Checks that every class, enumeration and interface have a header comment. -->
+    <module name="JavadocType">
+      <property name="allowMissingParamTags" value="true"/>
+    </module>
+
+    <!-- Checks that every public method (excluding getters, setters and constructors) has a header comment. -->
+    <module name="JavadocMethod">
+      <property name="allowedAnnotations" value="Override, Test, BeforeAll, BeforeEach, AfterAll, AfterEach, Subscribe"/>
+      <property name="scope" value="public"/>
+      <property name="validateThrows" value="false"/>
+      <property name="allowMissingParamTags" value="true"/>
+      <property name="allowMissingReturnTag" value="true"/>
+      <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
+    </module>
+
+    <module name="InvalidJavadocPosition"/>
+
+    <module name="MissingJavadocMethodCheck">
+      <property name="minLineCount" value="1"/>
+      <property name="allowMissingPropertyJavadoc" value="true"/>
+      <property name="ignoreMethodNamesRegex" value="(set.*|get.*)"/>
+    </module>
+
+  </module>
+</module>
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
new file mode 100644
index 0000000000..39efb6e4ac
--- /dev/null
+++ b/config/checkstyle/suppressions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+  <suppress checks="JavadocType" files=".*Test\.java"/>
+  <suppress checks="MissingJavadocMethodCheck" files=".*Test\.java"/>
+</suppressions>
diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java
index b710bb1d1a..ea7081de94 100644
--- a/src/main/java/duke/command/AddCommand.java
+++ b/src/main/java/duke/command/AddCommand.java
@@ -1,7 +1,7 @@
 package duke.command;
 
-import duke.task.Task;
 import duke.functionality.TaskList;
+import duke.task.Task;
 
 /**
  * Represents the add command. A <code>AddCommand</code> object corresponds to adding that specified task
diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java
index 48229c19d3..a305d8afac 100644
--- a/src/main/java/duke/command/Command.java
+++ b/src/main/java/duke/command/Command.java
@@ -1,12 +1,12 @@
 package duke.command;
 
-import duke.task.Task;
 import duke.functionality.TaskList;
+import duke.task.Task;
 
 /**
  * Represents the commands inputted by a user. The Command class cannot be instantiated as it is an abstract class.
  */
-public abstract class Command{
+public abstract class Command {
     protected Task task;
     protected Integer index;
     protected String word;
diff --git a/src/main/java/duke/command/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java
index 0c0940eb71..a09d3501ec 100644
--- a/src/main/java/duke/command/ExitCommand.java
+++ b/src/main/java/duke/command/ExitCommand.java
@@ -5,13 +5,13 @@
 /**
  * Represents the exit command. A <code>ExitCommand</code> object corresponds to exiting the Duke program.
  */
-public class ExitCommand extends Command{
+public class ExitCommand extends Command {
 
     /**
      * Constructor for ExitCommand class.
      */
     public ExitCommand() {
-        super(null, null,null);
+        super(null, null, null);
     }
 
     /**
diff --git a/src/main/java/duke/command/FindCommand.java b/src/main/java/duke/command/FindCommand.java
index 079e3fde2f..0edc671e60 100644
--- a/src/main/java/duke/command/FindCommand.java
+++ b/src/main/java/duke/command/FindCommand.java
@@ -6,7 +6,7 @@
  * Represents the find command. A <code>FindCommand</code> object corresponds to finding similar tasks
  * in the taskList of TaskList class.
  */
-public class FindCommand extends Command{
+public class FindCommand extends Command {
 
     /**
      * Constructor of FindCommand.
diff --git a/src/main/java/duke/command/MarkCommand.java b/src/main/java/duke/command/MarkCommand.java
index 8ce98dba8f..159a96c802 100644
--- a/src/main/java/duke/command/MarkCommand.java
+++ b/src/main/java/duke/command/MarkCommand.java
@@ -12,7 +12,7 @@ public class MarkCommand extends Command {
      * @param number an indicator to the index of the taskList in TaskList class.
      */
     public MarkCommand(Integer number) {
-        super(null, number,null);
+        super(null, number, null);
     }
 
     /**
diff --git a/src/main/java/duke/command/PrintCommand.java b/src/main/java/duke/command/PrintCommand.java
index 63d0c2d8f2..0a2943ba48 100644
--- a/src/main/java/duke/command/PrintCommand.java
+++ b/src/main/java/duke/command/PrintCommand.java
@@ -5,7 +5,7 @@
 /**
  * Represents the print command. A <code>PrintCommand</code> object allows users to see all task in Duke TaskBot.
  */
-public class PrintCommand extends Command{
+public class PrintCommand extends Command {
 
     /**
      * Constructor for PrintCommand class.
diff --git a/src/main/java/duke/command/UnmarkCommand.java b/src/main/java/duke/command/UnmarkCommand.java
index 1cdf8cfb0a..3e1b0401cb 100644
--- a/src/main/java/duke/command/UnmarkCommand.java
+++ b/src/main/java/duke/command/UnmarkCommand.java
@@ -6,7 +6,7 @@
  * Represents the unmark command. A <code>UnmarkCommand</code> object allows users to set the corresponding task as
  * not done.
  */
-public class UnmarkCommand extends Command{
+public class UnmarkCommand extends Command {
 
     /**
      * Constructor for the UnmarkCommand class.
diff --git a/src/main/java/duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java
index f875022086..899b5a130f 100644
--- a/src/main/java/duke/exception/DukeException.java
+++ b/src/main/java/duke/exception/DukeException.java
@@ -4,7 +4,7 @@
  * Represents the Exceptions the Duke program would handle. A <code> DukeException </code> object corresponds
  * to the exceptions specified and handled by Duke.
  */
-public class DukeException extends Exception{
+public class DukeException extends Exception {
 
     /**
      * Constructor for DukeException class.
diff --git a/src/main/java/duke/functionality/Parser.java b/src/main/java/duke/functionality/Parser.java
index 0573e791a7..0429e78085 100644
--- a/src/main/java/duke/functionality/Parser.java
+++ b/src/main/java/duke/functionality/Parser.java
@@ -5,14 +5,20 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 
-
-import duke.command.*;
+import duke.command.AddCommand;
+import duke.command.Command;
+import duke.command.DeleteCommand;
+import duke.command.ExitCommand;
+import duke.command.FindCommand;
+import duke.command.MarkCommand;
+import duke.command.PrintCommand;
+import duke.command.UnmarkCommand;
 import duke.exception.DukeException;
+import duke.exception.IncompleteCommandException;
+import duke.exception.InvalidCommandException;
 import duke.task.Deadline;
 import duke.task.Event;
 import duke.task.Todo;
-import duke.exception.IncompleteCommandException;
-import duke.exception.InvalidCommandException;
 
 /**
  * Represents the Parsing capabilities of the Duke project. A <code> Parse </code> object corresponds
@@ -29,8 +35,8 @@ public class Parser {
      * @param input date specified by user input. Eg, "2020-06-06".
      * @return formatted date.
      */
-    public static LocalDate formatDate(String input){
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern( "yyyy-MM-dd");
+    public static LocalDate formatDate(String input) {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate date = LocalDate.parse(input, dtf);
         return date;
     }
@@ -41,7 +47,7 @@ public static LocalDate formatDate(String input){
      * @return formatted time.
      */
     public static LocalTime formatTime(String input) {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern( "HHmm");
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("HHmm");
         LocalTime time = LocalTime.parse(input, dtf);
         return time;
     }
@@ -52,7 +58,7 @@ public static LocalTime formatTime(String input) {
      * @return date but as a String.
      */
     public static String dateToString(LocalDate input) {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern( "yyyy-MM-dd");
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String date = input.format(dtf);
         return date;
     }
@@ -63,7 +69,7 @@ public static String dateToString(LocalDate input) {
      * @return time but as a String.
      */
     public static String timeToString(LocalTime input) {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern( "HHmm");
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("HHmm");
         String time = input.format(dtf);
         return time;
     }
@@ -144,7 +150,7 @@ public static Command parse(String input) throws DukeException {
         } else if (command.equals("delete")) {
             return new DeleteCommand(Integer.parseInt(inputSplit[1]));
 
-        } else if(command.equals("find")) {
+        } else if (command.equals("find")) {
             return new FindCommand(inputSplit[1]);
 
         } else {
diff --git a/src/main/java/duke/functionality/Storage.java b/src/main/java/duke/functionality/Storage.java
index b153caa0cb..d51b71ea50 100644
--- a/src/main/java/duke/functionality/Storage.java
+++ b/src/main/java/duke/functionality/Storage.java
@@ -1,16 +1,15 @@
 package duke.functionality;
 
-import duke.task.Deadline;
-import duke.task.Event;
-import duke.task.Task;
-import duke.task.Todo;
-
-import java.util.Scanner;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.Scanner;
+
+import duke.task.Deadline;
+import duke.task.Event;
+import duke.task.Task;
+import duke.task.Todo;
 
 /**
  * Represents the Storage capabilities of the Duke project. A <code> Storage </code> object corresponds
@@ -25,7 +24,7 @@ public class Storage {
      * @param pwd user's current working directory.
      * @param path path to "/data/TaskData.txt".
      */
-    public Storage(String pwd, String path){
+    public Storage(String pwd, String path) {
         Storage.pwd = pwd;
         Storage.path = path;
     }
@@ -110,13 +109,13 @@ public static String craftOutput(Task task) {
         String output = "";
         String doneIcon = task.getStatusIcon();
         if (task instanceof Todo) {
-            if(doneIcon.equals("X")) {
+            if (doneIcon.equals("X")) {
                 output = "T|1|" + task.getDescription();
             } else {
                 output = "T|0|" + task.getDescription();
             }
         } else if (task instanceof Deadline) {
-            if(doneIcon.equals("X")) {
+            if (doneIcon.equals("X")) {
                 output = "D|1|" + task.getDescription() + "|" + Parser.dateToString(((Deadline) task).getDate())
                         + "|" + Parser.timeToString(((Deadline) task).getTime());
             } else {
@@ -124,7 +123,7 @@ public static String craftOutput(Task task) {
                         + "|" + Parser.timeToString(((Deadline) task).getTime());
             }
         } else if (task instanceof Event) {
-            if(doneIcon.equals("X")) {
+            if (doneIcon.equals("X")) {
                 output = "E|1|" + task.getDescription() + "|" + Parser.dateToString(((Event) task).getDate())
                         + "|" + Parser.timeToString(((Event) task).getStartTime())
                         + "|" + Parser.timeToString(((Event) task).getEndTime());
diff --git a/src/main/java/duke/functionality/TaskList.java b/src/main/java/duke/functionality/TaskList.java
index 08cad2eac4..797e8fee13 100644
--- a/src/main/java/duke/functionality/TaskList.java
+++ b/src/main/java/duke/functionality/TaskList.java
@@ -36,7 +36,7 @@ public void deleteTask(int taskNum) {
      * @param taskNum an indicator to the index of taskList.
      */
     public void markTask(int taskNum) {
-        String message = "Nice! I've marked this task as done:\n" ;
+        String message = "Nice! I've marked this task as done:\n";
         int actualTaskNum = taskNum - 1; //minus 1 as list index is from 0
         Task task = taskList.get(actualTaskNum); // get the task from the array
         task.setTaskDone();
@@ -60,11 +60,11 @@ public void unMarkTask(int taskNum) {
     /**
      * Returns nothing, but prints out all task in taskList.
      */
-    public void printList(){
+    public void printList() {
         String message = "Here are the tasks in your list:";
         System.out.println(message);
 
-        for(int i = 0; i < numOfTask; i++){
+        for (int i = 0; i < numOfTask; i++) {
             String output = i + 1 + "." + taskList.get(i).toString();
             System.out.println(output);
         }
@@ -82,19 +82,23 @@ public void addToList(Task task) {
         System.out.println(message + task.toString() + "\nNow you have " + numOfTask + " tasks in the list.");
     }
 
+    /**
+     * Returns nothing, but prints all task that contains that matches the specified word.
+     * @param word keyword input from user
+     */
     public void findWord(String word) {
         String message = "Here are the matching tasks in your list:\n";
         System.out.print(message);
         int counter = 1;
-        for(int i = 0; i < numOfTask; i++) {
+        for (int i = 0; i < numOfTask; i++) {
             Task task = taskList.get(i);
-            if(task.getDescription().contains(word)) {
+            if (task.getDescription().contains(word)) {
                 String output = counter + "." + task;
                 counter++;
                 System.out.println(output);
             }
         }
-        if(counter == 1) {
+        if (counter == 1) {
             System.out.println("OOPS!, there are no matching task with the word provided.");
         }
     }
diff --git a/src/main/java/duke/functionality/Ui.java b/src/main/java/duke/functionality/Ui.java
index 7b925a1e67..7c7c235b52 100644
--- a/src/main/java/duke/functionality/Ui.java
+++ b/src/main/java/duke/functionality/Ui.java
@@ -1,16 +1,16 @@
 package duke.functionality;
 
-import duke.exception.BlankCommandException;
-
 import java.util.Scanner;
 
+import duke.exception.BlankCommandException;
+
 /**
  * Represents the User Interface of the Duke project. A <code> Ui </code> object corresponds
  * to all user interface displays. Such as the messages.
  */
 public class Ui {
-    private final String GREETING = "Hello! I'm TaskJamie\nWhat can i do for you?";
-    private final String ENDING =  "Bye. Hope to see you again soon!";
+    private static final String GREETING = "Hello! I'm TaskJamie\nWhat can i do for you?";
+    private static final String ENDING = "Bye. Hope to see you again soon!";
 
     /**
      * Returns nothing, but prints out the greeting message of Duke TaskBot.
@@ -36,7 +36,9 @@ public void showError(String error) {
     /**
      * Returns nothing, but prints out the error messages when loading in the text file.
      */
-    public void showLoadingError(String error) { System.out.println(error); }
+    public void showLoadingError(String error) {
+        System.out.println(error);
+    }
 
     /**
      * Returns a full command gotten from user input.
diff --git a/src/main/java/duke/main/Duke.java b/src/main/java/duke/main/Duke.java
index bf4e6f2239..67cf1733be 100644
--- a/src/main/java/duke/main/Duke.java
+++ b/src/main/java/duke/main/Duke.java
@@ -3,11 +3,11 @@
 import java.io.IOException;
 
 import duke.command.Command;
+import duke.exception.DukeException;
 import duke.functionality.Parser;
 import duke.functionality.Storage;
 import duke.functionality.TaskList;
 import duke.functionality.Ui;
-import duke.exception.DukeException;
 
 /**
  * Represents the starting point of the Duke project. A <code> Duke </code> object corresponds
@@ -41,7 +41,7 @@ public Duke(String pwd, String filePath) {
     public void run() {
         this.ui.showGreeting();
         boolean isExit = false;
-        while(!isExit) {
+        while (!isExit) {
             try {
                 String fullCommand = ui.readCommand();
                 Command c = Parser.parse(fullCommand);
@@ -60,6 +60,6 @@ public void run() {
      */
     public static void main(String[] args) {
         String home = System.getProperty("user.home");
-        new Duke(home,"/data/TaskData.txt").run();
+        new Duke(home, "/data/TaskData.txt").run();
     }
 }
diff --git a/src/test/java/duke/functionality/ParserTest.java b/src/test/java/duke/functionality/ParserTest.java
index 81a673d796..20cc551272 100644
--- a/src/test/java/duke/functionality/ParserTest.java
+++ b/src/test/java/duke/functionality/ParserTest.java
@@ -1,37 +1,38 @@
 package duke.functionality;
 
-import duke.exception.DukeException;
-
-import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 
+import org.junit.jupiter.api.Test;
+
+import duke.exception.DukeException;
+
 public class ParserTest {
 
     @Test
     public void testInvalidCommandException() {
         try {
             assertEquals(0, Parser.parse("blah"));
-        } catch (DukeException e ) {
+        } catch (DukeException e) {
             assertEquals("OOPS!!! I'm sorry, but I don't know what that means :-(", e.getMessage());
         }
     }
 
     @Test
-    public void testIncompleteCommandException(){
+    public void testIncompleteCommandException() {
         try {
             assertEquals(0, Parser.parse("todo"));
-        } catch (DukeException e ) {
+        } catch (DukeException e) {
             assertEquals("OOPS!!! The description of a todo cannot be empty.", e.getMessage());
         }
     }
 
     @Test
-    public void dateToString_validDate_success(){
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern( "yyyy-MM-dd");
+    public void dateToString_validDate_success() {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate test1 = LocalDate.parse("2020-06-06", dtf);
         assertEquals("2020-06-06", Parser.dateToString(test1));
 
@@ -40,12 +41,12 @@ public void dateToString_validDate_success(){
     }
 
     @Test
-    public void timeToString_validTime_success(){
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern( "HHmm");
-        LocalTime test1 = LocalTime.parse("1800",dtf);
-        assertEquals("1800",Parser.timeToString(test1));
+    public void timeToString_validTime_success() {
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("HHmm");
+        LocalTime test1 = LocalTime.parse("1800", dtf);
+        assertEquals("1800", Parser.timeToString(test1));
 
-        LocalTime test2 = LocalTime.parse("2400",dtf);
-        assertEquals("0000",Parser.timeToString(test2));
+        LocalTime test2 = LocalTime.parse("2400", dtf);
+        assertEquals("0000", Parser.timeToString(test2));
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/duke/task/TaskTest.java b/src/test/java/duke/task/TaskTest.java
index b691b0aa66..ab4fbe0144 100644
--- a/src/test/java/duke/task/TaskTest.java
+++ b/src/test/java/duke/task/TaskTest.java
@@ -1,8 +1,10 @@
 package duke.task;
 
-import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
+
 public class TaskTest {
 
     @Test
@@ -25,4 +27,4 @@ public void testSetters() {
         temp.setTaskNotDone();
         assertEquals(" ", temp.getStatusIcon());
     }
-}
\ No newline at end of file
+}