diff --git a/tangostationcontrol/tangostationcontrol/devices/antennafield.py b/tangostationcontrol/tangostationcontrol/devices/antennafield.py
index 888ff9c399df82898feab4d733525cc542f54c66..76144882779f616a56b7420916414c9ddf423785 100644
--- a/tangostationcontrol/tangostationcontrol/devices/antennafield.py
+++ b/tangostationcontrol/tangostationcontrol/devices/antennafield.py
@@ -1756,13 +1756,10 @@ class AntennaToRecvMapper(object):
         if len(value_mapping) == 2:
             # Assuming mapper lists are always in the following order:
             # [Control_Mapping, Power_Mapping]
-            control_mapping = value_mapping[0]
-            power_mapping = value_mapping[1]
+            [control_mapping, power_mapping] = value_mapping
             for idx, mapping in enumerate(control_mapping):
-                recv_control = mapping[0]
-                rcu_control = mapping[1]
-                recv_power = power_mapping[idx][0]
-                rcu_power = power_mapping[idx][1]
+                [recv_control, rcu_control] = mapping
+                [recv_power, rcu_power] = power_mapping[idx]
                 if recv_control > 0:
                     mapped_values[idx][0] = recv_results[recv_control - 1][rcu_control]
                 if recv_power > 0: