1 files changed, 26 insertions, 24 deletions

diff --git a/draft-summermatter-set-union.xml b/draft-summermatter-set-union.xml
index 3548fa9..98b2a3b 100644
--- a/draft-summermatter-set-union.xml
+++ b/draft-summermatter-set-union.xml
@@ -2044,10 +2044,12 @@ hashSum |    0x0101   |    0x5151   |    0x5050   |    0x0000   |
                     <figure anchor="performance_formulas_operationmode_code">
                         <artwork name="" type="" align="left" alt=""><![CDATA[
 # CONSTANTS:
-# IBF_BUCKET_NUMBER_FACTOR = 2: The amount the IBF gets increased if decoding fails
-# RTT_MIN_FULL = 2: Minimal round trips used for full syncronisation (always 2 or 2.5)
+# IBF_BUCKET_NUMBER_FACTOR = 2: The amount the IBF gets increased if
+#                               decoding fails
+# RTT_MIN_FULL = 2: Minimal round trips used for full Synchronisation
 # IBF_MIN_SIZE = 37: The minimal size of an IBF
-# MAX_BUCKETS_PER_MESSAGE: Custom value depending on the underlying protocol
+# MAX_BUCKETS_PER_MESSAGE: Custom value depending on the underlying
+#                          protocol
 # INPUTS:
 # avg_es: The average element size
 # lss: The initial local set size
@@ -2056,7 +2058,8 @@ hashSum |    0x0101   |    0x5151   |    0x5050   |    0x0000   |
 # rsd: the estimated remote set difference calculated by the SE
 # rtt: the tradeoff between round trips and bandwidth
 # OUTPUT:
-# FULL_SYNC_REMOTE_SENDING_FIRST, FULL_SYNC_LOCAL_SENDING_FIRST or DIFFERENTIAL_SYNC
+# FULL_SYNC_REMOTE_SENDING_FIRST, FULL_SYNC_LOCAL_SENDING_FIRST or
+# DIFFERENTIAL_SYNC
 
 FUNCTION decide_operation_mode(avg_es,
                                lss,
@@ -2066,11 +2069,6 @@ FUNCTION decide_operation_mode(avg_es,
                                rtt)
 
     # If a set size is zero always do full sync
-    # TODO: check if these two conditions are
-    # actually meaningful, I suspect even without
-    # this check at the beginning the logic below
-    # should always yield the same result for these
-    # extreme cases, allowing us to omit this code.
     IF 0 == rss THEN
         RETURN FULL_SYNC_LOCAL_SENDING_FIRST
     END IF
@@ -2078,25 +2076,27 @@ FUNCTION decide_operation_mode(avg_es,
         RETURN FULL_SYNC_REMOTE_SENDING_FIRST
     END IF
 
-    # Estimate required transferred bytes when doing a full synchronisation
-    # and transmitting local set first.
+    # Estimate required transferred bytes when doing a full
+    # synchronisation and transmitting local set first.
+    semh = sizeof(ELEMENT_MSG_HEADER)
     estimated_total_diff = rsd + lsd
     total_elements_local_send = rsd + lss
     cost_local_full_sync = avg_es * total_elements_local_send
-                           + total_elements_local_send * sizeof(ELEMENT_MSG_HEADER)
+                           + total_elements_local_send * semh
                            + sizeof(FULL_DONE_MSG_HEADER) * 2
                            + RTT_MIN_FULL * rtt
 
-    # Estimate required transferred bytes when doing a full synchronisation
-    # and transmitting remote set first.
+    # Estimate required transferred bytes when doing a full
+    # synchronisation and transmitting remote set first.
     total_elements_remote_send = lsd + rss
     cost_remote_full_sync = avg_es * total_elements_remote_send
-                            + total_elements_remote_send * sizeof(ELEMENT_MSG_HEADER)
+                            + total_elements_remote_send * semh
                             + sizeof(FULL_DONE_MSG_HEADER) * 2
                             + (RTT_MIN_FULL + 0.5) * rtt
                             + sizeof(REQUEST_FULL_MSG)
 
-    # Estimate required transferred bytes when doing a differential synchronisation
+    # Estimate required transferred bytes when doing a differential
+    #  synchronisation
 
     # Estimate messages required to transfer IBF
     ibf_bucket_count = estimated_total_diff * IBF_BUCKET_NUMBER_FACTOR
@@ -2167,7 +2167,8 @@ END FUNCTION
                     <figure anchor="performance_formula_ibf_parameters_code">
                         <artwork name="" type="" align="left" alt=""><![CDATA[
 # CONSTANTS:
-# IBF_BUCKET_NUMBER_FACTOR = 2: The amount the IBF gets increased if decoding fails
+# IBF_BUCKET_NUMBER_FACTOR = 2: The amount the IBF gets increased
+                                if decoding fails
 # Inputs:
 # sd: Estimated set difference
 # Output:
@@ -2319,14 +2320,15 @@ FUNCTION END
 # INPUTS:
 # ibf: The IBF
 # offset: The offset which defines the starting point from which bucket
-           the packed operation starts
+          the packed operation starts
 # count: The number of buckets in the array that will be packed
 # cbl: The bit length of the counter can be found in the
-                      ibf message in the ibf_counter_bit_length field
+       ibf message in the ibf_counter_bit_length field
 # pd: A byte array which contains the data packed with the pack_counter
-               function
+      function
 # OUTPUTS:
-# returns: Nothing because the unpacked counter is saved directly into the IBF
+# returns: Nothing because the unpacked counter is saved directly
+           into the IBF
 
 FUNCTION unpack_counter(ibf, offset, count, cbl, pd)
     ibf_bucket_ctr = 0
@@ -3096,9 +3098,9 @@ Type    | Name                       | References | Description
                                                     full set to the other
                                                     peer.
  560    | SETU_P2P_DEMAND            | [This.I-D] | Demand the whole
-                                                    element from the other
-                                                    peer, given only the
-                                                    hash code.
+                                                    element from the
+                                                    otherpeer, given
+                                                    only the hash code.
  561    | SETU_P2P_INQUIRY           | [This.I-D] | Tell the other peer
                                                     to send a list of
                                                     hashes that match