diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java
index 3ad60ef..ff57b61 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeCheckCommand.java
@@ -27,7 +27,8 @@
 import org.onosproject.openstacknode.api.OpenstackNodeService;
 
 import static org.onosproject.net.AnnotationKeys.PORT_NAME;
-import static org.onosproject.openstacknode.api.Constants.*;
+import static org.onosproject.openstacknode.api.Constants.DEFAULT_TUNNEL;
+import static org.onosproject.openstacknode.api.Constants.INTEGRATION_BRIDGE;
 
 /**
  * Checks detailed node init state.
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java
index 5cc3285..d620e37 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeInitCommand.java
@@ -25,9 +25,6 @@
 import org.onosproject.openstacknode.api.OpenstackNodeAdminService;
 import org.onosproject.openstacknode.api.OpenstackNodeService;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * Initializes nodes for OpenStack node service.
  */
@@ -64,16 +61,12 @@
         }
 
         if (isAll) {
-            List<String> osNodes = osNodeService.nodes().stream()
-                    .map(OpenstackNode::hostname)
-                    .collect(Collectors.toList());
-            hostnames = osNodes.toArray(new String[osNodes.size()]);
+            hostnames = osNodeService.nodes().stream()
+                    .map(OpenstackNode::hostname).toArray(String[]::new);
         } else if (isIncomplete) {
-            List<String> osNodes = osNodeService.nodes().stream()
+            hostnames = osNodeService.nodes().stream()
                     .filter(osNode -> osNode.state() != NodeState.COMPLETE)
-                    .map(OpenstackNode::hostname)
-                    .collect(Collectors.toList());
-            hostnames = osNodes.toArray(new String[osNodes.size()]);
+                    .map(OpenstackNode::hostname).toArray(String[]::new);
         }
 
         for (String hostname : hostnames) {