diff --git a/src/frame.c b/src/frame.c
index 3deb05a..ef8d03f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -27,9 +27,7 @@ static ssize_t decode_station(patty_ax25_address *address,
             /*
              * Take note if we have reached the end of the call sign.
              */
-            if (space == 0) {
-                space = 1;
-            }
+            space = 1;
 
             address->callsign[i] = '\0';
         } else {
@@ -117,10 +115,6 @@ static ssize_t decode_address(patty_ax25_frame *frame,
         offset += decoded;
     }
 
-    /*
-     * It would be considered erroneous if the destination address did have the
-     * extension bit set to 1.
-     */
     if ((decoded = decode_station(&frame->src, data, offset)) < 0) {
         goto error;
     } else {