diff --git a/Source/Receiver.cpp b/Source/Receiver.cpp
index b36aa56..bd1c353 100644
--- a/Source/Receiver.cpp
+++ b/Source/Receiver.cpp
@@ -623,15 +623,15 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
 			cpx_t winner_diff = Cpx(0,0);
 			radio_float_t winner_d = 1000;
 			int winner_i = 0;
-			cpx_t diff;
-			radio_float_t d;
 			for (int i=0; i < 4; i++)
 			{
-				diff = CpxSubS(IQ_soft, m_trackers_[i]);
-				d = CpxMagS(diff);
-				if (d < winner_d)
+				cpx_t diff = CpxSubS(IQ_soft, m_trackers_[i]);
+				radio_float_t distance = CpxMagS(diff);
+
+				// Find tracker with smallest distance from current symbol
+				if (distance < winner_d)
 				{
-					winner_d = d;
+					winner_d = distance;
 					winner_i = i;
 					winner_diff = diff;
 				}