diff --git a/src/main/java/seedu/address/logic/commands/customer/CustomerAddCommand.java b/src/main/java/seedu/address/logic/commands/customer/CustomerAddCommand.java
index 94c456ae8cb..0581b89a0cb 100644
--- a/src/main/java/seedu/address/logic/commands/customer/CustomerAddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/customer/CustomerAddCommand.java
@@ -1,4 +1,4 @@
-//@@author {zhonghan721}
+//@@author zhonghan721
 package seedu.address.logic.commands.customer;
 
 import static java.util.Objects.requireNonNull;
@@ -100,4 +100,4 @@ public String toString() {
             .toString();
     }
 }
-//@@author {zhonghan721}
+//@@author zhonghan721
diff --git a/src/main/java/seedu/address/logic/commands/customer/CustomerDeleteCommand.java b/src/main/java/seedu/address/logic/commands/customer/CustomerDeleteCommand.java
index 32a5c30a258..1cf76682e83 100644
--- a/src/main/java/seedu/address/logic/commands/customer/CustomerDeleteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/customer/CustomerDeleteCommand.java
@@ -1,4 +1,4 @@
-//@@author {jianyangg}
+//@@author jianyangg
 package seedu.address.logic.commands.customer;
 
 import static java.util.Objects.requireNonNull;
@@ -127,4 +127,4 @@ public String toString() {
             .toString();
     }
 }
-//@@author {jianyangg}
+//@@author jianyangg
diff --git a/src/main/java/seedu/address/logic/commands/customer/CustomerEditCommand.java b/src/main/java/seedu/address/logic/commands/customer/CustomerEditCommand.java
index a437e8058df..a24c9039680 100644
--- a/src/main/java/seedu/address/logic/commands/customer/CustomerEditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/customer/CustomerEditCommand.java
@@ -1,4 +1,4 @@
-//@@author {Gabriel4357}
+//@@author Gabriel4357
 package seedu.address.logic.commands.customer;
 
 import static java.util.Objects.requireNonNull;
@@ -181,7 +181,7 @@ protected static void updateDelivery(Model model, Customer editedCustomer) {
     }
 
 
-    //@@author {zhonghan721}
+    //@@author zhonghan721
 
     /**
      * Creates and returns a {@code Delivery} with the customer details edited.
@@ -210,7 +210,8 @@ private static Delivery createEditedDelivery(Delivery deliveryToEdit, Customer e
         return new Delivery(deliveryToEdit.getDeliveryId(), deliveryName, editedCustomer, orderDate,
                 deliveryDate, deliveryStatus, note);
     }
-    //@@author {zhonghan721}
+    //@@author zhonghan721
+    //@@author Gabriel4357
 
     @Override
     public boolean equals(Object other) {
@@ -339,4 +340,4 @@ public String toString() {
         }
     }
 }
-//@@author {Gabriel4357}
+//@@author Gabriel4357
diff --git a/src/main/java/seedu/address/logic/commands/customer/CustomerFindCommand.java b/src/main/java/seedu/address/logic/commands/customer/CustomerFindCommand.java
index 88d3034fdfb..134a0a9006b 100644
--- a/src/main/java/seedu/address/logic/commands/customer/CustomerFindCommand.java
+++ b/src/main/java/seedu/address/logic/commands/customer/CustomerFindCommand.java
@@ -1,4 +1,4 @@
-//@@author {zhonghan721}
+//@@author zhonghan721
 package seedu.address.logic.commands.customer;
 
 import static java.util.Objects.requireNonNull;
@@ -76,4 +76,4 @@ public String toString() {
             .toString();
     }
 }
-//@@author {zhonghan721}
+//@@author zhonghan721
diff --git a/src/main/java/seedu/address/logic/commands/customer/CustomerListCommand.java b/src/main/java/seedu/address/logic/commands/customer/CustomerListCommand.java
index 2877801f020..4e4223ba348 100644
--- a/src/main/java/seedu/address/logic/commands/customer/CustomerListCommand.java
+++ b/src/main/java/seedu/address/logic/commands/customer/CustomerListCommand.java
@@ -1,3 +1,4 @@
+//@@author B-enguin
 package seedu.address.logic.commands.customer;
 
 import static java.util.Objects.requireNonNull;
@@ -40,4 +41,4 @@ public CommandResult execute(Model model) throws CommandException {
         return new CommandResult(MESSAGE_SUCCESS, true);
     }
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/commands/customer/CustomerViewCommand.java b/src/main/java/seedu/address/logic/commands/customer/CustomerViewCommand.java
index f38efdab414..77f970fbccd 100644
--- a/src/main/java/seedu/address/logic/commands/customer/CustomerViewCommand.java
+++ b/src/main/java/seedu/address/logic/commands/customer/CustomerViewCommand.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.commands.customer;
 
 import static java.util.Objects.requireNonNull;
@@ -69,4 +69,4 @@ public boolean equals(Object other) {
             && customerId == ((CustomerViewCommand) other).customerId); // state check
     }
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/commands/delivery/DeliveryAddCommand.java b/src/main/java/seedu/address/logic/commands/delivery/DeliveryAddCommand.java
index 421a256471f..57d53f2a7f4 100644
--- a/src/main/java/seedu/address/logic/commands/delivery/DeliveryAddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/delivery/DeliveryAddCommand.java
@@ -1,4 +1,4 @@
-//@@author {Gabriel4357}
+//@@author Gabriel4357
 package seedu.address.logic.commands.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -241,4 +241,4 @@ public String toString() {
         }
     }
 }
-//@@author {Gabriel4357}
+//@@author Gabriel4357
diff --git a/src/main/java/seedu/address/logic/commands/delivery/DeliveryCreateNoteCommand.java b/src/main/java/seedu/address/logic/commands/delivery/DeliveryCreateNoteCommand.java
index 3fc3c3fe0be..8960a2682a7 100644
--- a/src/main/java/seedu/address/logic/commands/delivery/DeliveryCreateNoteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/delivery/DeliveryCreateNoteCommand.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.commands.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -136,4 +136,4 @@ public String toString() {
                 .toString();
     }
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/commands/delivery/DeliveryEditCommand.java b/src/main/java/seedu/address/logic/commands/delivery/DeliveryEditCommand.java
index f07f55eaed8..d4aa63058cb 100644
--- a/src/main/java/seedu/address/logic/commands/delivery/DeliveryEditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/delivery/DeliveryEditCommand.java
@@ -1,4 +1,4 @@
-//@@author {Gabriel4357}
+//@@author Gabriel4357
 package seedu.address.logic.commands.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -319,4 +319,4 @@ public String toString() {
     }
 }
 
-//@@author {Gabriel4357}
+//@@author Gabriel4357
diff --git a/src/main/java/seedu/address/logic/commands/delivery/DeliveryFindCommand.java b/src/main/java/seedu/address/logic/commands/delivery/DeliveryFindCommand.java
index 06c6b2683dc..75f90b40f80 100644
--- a/src/main/java/seedu/address/logic/commands/delivery/DeliveryFindCommand.java
+++ b/src/main/java/seedu/address/logic/commands/delivery/DeliveryFindCommand.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.commands.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -80,4 +80,4 @@ public String toString() {
               .toString();
     }
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/commands/delivery/DeliveryListCommand.java b/src/main/java/seedu/address/logic/commands/delivery/DeliveryListCommand.java
index d15f9f660e9..8c01fc0f1d3 100644
--- a/src/main/java/seedu/address/logic/commands/delivery/DeliveryListCommand.java
+++ b/src/main/java/seedu/address/logic/commands/delivery/DeliveryListCommand.java
@@ -1,4 +1,4 @@
-//@@author {juliusgambe}
+//@@author juliusgambe
 package seedu.address.logic.commands.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -171,4 +171,4 @@ public boolean equals(Object other) {
         return sortType.equals(otherDeliveryListCommand.sortType);
     }
 }
-//@@author {juliusgambe}
+//@@author juliusgambe
diff --git a/src/main/java/seedu/address/logic/commands/delivery/DeliveryStatusCommand.java b/src/main/java/seedu/address/logic/commands/delivery/DeliveryStatusCommand.java
index 072fbedbaf8..93255158805 100644
--- a/src/main/java/seedu/address/logic/commands/delivery/DeliveryStatusCommand.java
+++ b/src/main/java/seedu/address/logic/commands/delivery/DeliveryStatusCommand.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.commands.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -134,4 +134,4 @@ public String toString() {
                 .toString();
     }
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/parser/customer/CustomerEditCommandParser.java b/src/main/java/seedu/address/logic/parser/customer/CustomerEditCommandParser.java
index d4242af5537..f9a8268c008 100644
--- a/src/main/java/seedu/address/logic/parser/customer/CustomerEditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/customer/CustomerEditCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {Gabriel4357}
+//@@author Gabriel4357
 
 package seedu.address.logic.parser.customer;
 
diff --git a/src/main/java/seedu/address/logic/parser/customer/CustomerViewCommandParser.java b/src/main/java/seedu/address/logic/parser/customer/CustomerViewCommandParser.java
index c08b0f9f3b1..24a9fd4ba3f 100644
--- a/src/main/java/seedu/address/logic/parser/customer/CustomerViewCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/customer/CustomerViewCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.parser.customer;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
@@ -57,4 +57,4 @@ public CustomerViewCommand parse(String args) throws ParseException {
     }
 
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryAddCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryAddCommandParser.java
index a8c75016f18..e5c9bf78944 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryAddCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryAddCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {Gabriel4357}
+//@@author Gabriel4357
 package seedu.address.logic.parser.delivery;
 
 
@@ -68,4 +68,4 @@ public DeliveryAddCommand parse(String args) throws ParseException {
         return new DeliveryAddCommand(deliveryAddDescriptor);
     }
 }
-//@@author {Gabriel4357}
+//@@author Gabriel4357
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryCreateNoteCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryCreateNoteCommandParser.java
index af239859d81..b32709a34ab 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryCreateNoteCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryCreateNoteCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.parser.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -61,4 +61,4 @@ public DeliveryCreateNoteCommand parse(String args) throws ParseException {
 
     }
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryDeleteCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryDeleteCommandParser.java
index 870624d579a..84ddf8ee78a 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryDeleteCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryDeleteCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {Gabriel4357}
+//@@author Gabriel4357
 package seedu.address.logic.parser.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -39,4 +39,4 @@ public DeliveryDeleteCommand parse(String args) throws ParseException {
         }
     }
 }
-//@@author {Gabriel4357}
+//@@author Gabriel4357
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryEditCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryEditCommandParser.java
index bc96701902a..c5207c18da6 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryEditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryEditCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {Gabriel4357}
+//@@author Gabriel4357
 package seedu.address.logic.parser.delivery;
 
 import static java.util.Objects.requireNonNull;
@@ -109,4 +109,4 @@ public DeliveryEditDescriptor createDeliveryEditDescriptor(ArgumentMultimap argM
         return deliveryEditDescriptor;
     }
 }
-//@@author {Gabriel4357}
+//@@author Gabriel4357
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryFindCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryFindCommandParser.java
index db9a1627cf8..04ad213def1 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryFindCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryFindCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.parser.delivery;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
@@ -41,4 +41,4 @@ public DeliveryFindCommand parse(String args) throws ParseException {
         return new DeliveryFindCommand(new DeliveryNameContainsKeywordsPredicate(Arrays.asList(nameKeywords)));
     }
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryListCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryListCommandParser.java
index 9c63c03e8ff..236c5ea9768 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryListCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryListCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {juliusgambe}
+//@@author juliusgambe
 package seedu.address.logic.parser.delivery;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
@@ -104,4 +104,4 @@ public boolean equals(Object other) {
 
     }
 }
-//@@author {juliusgambe}
+//@@author juliusgambe
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryStatusCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryStatusCommandParser.java
index 930912c127e..51fb0a68463 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryStatusCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryStatusCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {B-enguin}
+//@@author B-enguin
 package seedu.address.logic.parser.delivery;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
@@ -59,4 +59,4 @@ public DeliveryStatusCommand parse(String args) throws ParseException {
     }
 
 }
-//@@author {B-enguin}
+//@@author B-enguin
diff --git a/src/main/java/seedu/address/logic/parser/delivery/DeliveryViewCommandParser.java b/src/main/java/seedu/address/logic/parser/delivery/DeliveryViewCommandParser.java
index 0c13109d8dd..1aaf1e1d0f9 100644
--- a/src/main/java/seedu/address/logic/parser/delivery/DeliveryViewCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/delivery/DeliveryViewCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {juliusgambe}
+//@@author juliusgambe
 package seedu.address.logic.parser.delivery;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
@@ -46,4 +46,4 @@ public DeliveryViewCommand parse(String args) throws ParseException {
         return new DeliveryViewCommand(deliveryId);
     }
 }
-//@@author {juliusgambe}
+//@@author juliusgambe
diff --git a/src/main/java/seedu/address/logic/parser/user/UserUpdateCommandParser.java b/src/main/java/seedu/address/logic/parser/user/UserUpdateCommandParser.java
index 2dbf2db04aa..3020f443fff 100644
--- a/src/main/java/seedu/address/logic/parser/user/UserUpdateCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/user/UserUpdateCommandParser.java
@@ -1,4 +1,4 @@
-//@@author {zhonghan721}
+//@@author zhonghan721
 package seedu.address.logic.parser.user;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
@@ -147,4 +147,4 @@ public UserUpdateDescriptor parseSecretQuestionAndAnswer(ArgumentMultimap argMul
         return userUpdateDescriptor;
     }
 }
-//@@author {zhonghan721}
+//@@author zhonghan721
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
index 406675e8bb2..90b4b9e9381 100644
--- a/src/main/java/seedu/address/model/ModelManager.java
+++ b/src/main/java/seedu/address/model/ModelManager.java
@@ -176,7 +176,7 @@ public void setAddressBookFilePath(Path addressBookFilePath) {
     }
 
 
-    //@@author {B-enguin}
+    //@@author B-enguin
     @Override
     public void setAddressBook(ReadOnlyBook<Customer> addressBook) {
         this.addressBook.resetData(addressBook);
@@ -186,7 +186,7 @@ public void setAddressBook(ReadOnlyBook<Customer> addressBook) {
     public ReadOnlyBook<Customer> getAddressBook() {
         return addressBook;
     }
-    //@@author {B-enguin}
+    //@@author
 
     @Override
     public Optional<Customer> getCustomer(int id) {
@@ -293,7 +293,7 @@ public boolean isFilteredCustomerListEmpty() {
 
     //=========== User Related Methods =======================================================================
 
-    //@@author {jianyangg}
+    //@@author jianyangg
 
     /**
      * Returns the status of the login as a string.
@@ -313,7 +313,7 @@ public String getLoginStatus() {
 
         return "Logged out. Please login to continue.";
     }
-    //@@author {jianyangg}
+    //@@author
 
     /**
      * Returns true if the {@code user} is currently logged in.