diff --git a/pytest_libiio/plugin.py b/pytest_libiio/plugin.py
index 6b41255..8f84508 100644
--- a/pytest_libiio/plugin.py
+++ b/pytest_libiio/plugin.py
@@ -92,10 +92,9 @@ def single_ctx_desc(request, _contexts):
         hardware = hardware if isinstance(hardware, list) else [hardware]
         if not marker:
             return _contexts[0]
-        else:
-            for dec in _contexts:
-                if dec["hw"] in marker.args[0]:
-                    return dec
+        for dec in _contexts:
+            if dec["hw"] in marker.args[0]:
+                return dec
     pytest.skip("No required hardware found")
 
 
@@ -200,16 +199,12 @@ def lookup_hw_from_map(ctx, map):
                         for attr_dict in driver_or_attr["ctx_attr"]:
                             for attr_name in attr_dict:
                                 # loop over found and compare to
-                                for hw_ctx_attr in ctx_attrs:
+                                for hw_ctx_attr, value in ctx_attrs.items():
                                     if (
                                         hw_ctx_attr == attr_name
-                                        and attr_dict[attr_name]
-                                        in ctx_attrs[hw_ctx_attr]
+                                        and attr_dict[attr_name] in value
                                     ):
                                         found += 1
-                    # Compare other attribute types ...
-                    if attr_type == "dev_attr":
-                        pass
                 continue
             # Loop over drivers
             for h in hw:
@@ -231,10 +226,7 @@ def lookup_hw_from_map(ctx, map):
 
 
 def find_contexts(config, map, request):
-    if request.config.getoption("--skip-scan"):
-        ctxs = None
-    else:
-        ctxs = iio.scan_contexts()
+    ctxs = None if request.config.getoption("--skip-scan") else iio.scan_contexts()
     if not ctxs:
         print("\nNo libiio contexts found")
         return False