diff --git a/cli/src/main/java/org/onosproject/cli/app/ApplicationCommand.java b/cli/src/main/java/org/onosproject/cli/app/ApplicationCommand.java
index 51bb9db..c9d8f08 100644
--- a/cli/src/main/java/org/onosproject/cli/app/ApplicationCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/app/ApplicationCommand.java
@@ -70,7 +70,7 @@
     // Installs the application from input of the specified URL
     private boolean installApp(ApplicationAdminService service, String url) {
         try {
-            if (url.equals("-")) {
+            if ("-".equals(url)) {
                 service.install(System.in);
             } else {
                 service.install(new URL(url).openStream());
diff --git a/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java b/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java
index be921cc..f8d86f1 100644
--- a/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java
@@ -63,9 +63,9 @@
 //            if (previousApps.contains(app.id().name())) {
 //                continue;
 //            }
-            if (cmd.equals("uninstall") ||
-                    (cmd.equals("activate") && state == INSTALLED) ||
-                    (cmd.equals("deactivate") && state == ACTIVE)) {
+            if ("uninstall".equals(cmd) ||
+                    ("activate".equals(cmd) && state == INSTALLED) ||
+                    ("deactivate".equals(cmd) && state == ACTIVE)) {
                 strings.add(app.id().name());
             }
         }