diff --git a/osmclient/sol005/sdncontroller.py b/osmclient/sol005/sdncontroller.py
index 3d4b7f7..b8860d7 100644
--- a/osmclient/sol005/sdncontroller.py
+++ b/osmclient/sol005/sdncontroller.py
@@ -61,10 +61,7 @@
         """Returns id of name, or the id itself if given as argument"""
         self._logger.debug("")
         for sdnc in self.list():
-            if name == sdnc["_id"]:
-                return sdnc["_id"]
-        for sdnc in self.list():
-            if name == sdnc["name"]:
+            if name == sdnc["_id"] or name == sdnc["name"]:
                 return sdnc["_id"]
         return ""
 
diff --git a/osmclient/sol005/vim.py b/osmclient/sol005/vim.py
index 4962a91..6be1dbb 100644
--- a/osmclient/sol005/vim.py
+++ b/osmclient/sol005/vim.py
@@ -62,10 +62,7 @@
         self._logger.debug("")
         self._client.get_token()
         for vim in self.list():
-            if name == vim["uuid"]:
-                return vim["uuid"]
-        for vim in self.list():
-            if name == vim["name"]:
+            if name == vim["uuid"] or name == vim["name"]:
                 return vim["uuid"]
         return ""
 
diff --git a/osmclient/sol005/wim.py b/osmclient/sol005/wim.py
index 2466113..c9249d0 100644
--- a/osmclient/sol005/wim.py
+++ b/osmclient/sol005/wim.py
@@ -61,10 +61,7 @@
         """Returns id of name, or the id itself if given as argument"""
         self._logger.debug("")
         for wim in self.list():
-            if name == wim["uuid"]:
-                return wim["uuid"]
-        for wim in self.list():
-            if name == wim["name"]:
+            if name == wim["uuid"] or name == wim["name"]:
                 return wim["uuid"]
         return ""