diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/seedu/address/logic/Messages.java
index b6546eeadc7..2b1b13a09cb 100644
--- a/src/main/java/seedu/address/logic/Messages.java
+++ b/src/main/java/seedu/address/logic/Messages.java
@@ -18,8 +18,8 @@ public class Messages {
                     + "Please follow the command format below and try again! \n%1$s";
 
     public static final String MESSAGE_INVALID_COMPANY_DISPLAYED_INDEX =
-        "Oops! You have entered an index that is greater than the number of companies that you have. "
-                + "Please try again!";
+        "Oops! You have entered an index that is greater than the number of companies that you have in the "
+                + "current list. Please try again!";
 
     public static final String MESSAGE_COMPANIES_LISTED_OVERVIEW = "Company(s) listed: %1$d";
 
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 905fbdefaf2..e57a9ae3d5e 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -39,7 +39,8 @@ public class EditCommand extends Command {
 
     public static final String COMMAND_WORD = "edit";
 
-    public static final String MESSAGE_USAGE = "Parameters: INDEX (must be a positive integer) "
+    public static final String MESSAGE_USAGE = "Format: " + COMMAND_WORD + " "
+            + "INDEX (must be a positive integer) "
             + "[" + PREFIX_COMPANY_NAME + "COMPANY_NAME] "
             + "[" + PREFIX_RECRUITER_NAME + "RECRUITER_NAME] "
             + "[" + PREFIX_ROLE + "ROLE] "