diff --git a/include/patty/ax25/sock.h b/include/patty/ax25/sock.h
index e45994c..3a903ae 100644
--- a/include/patty/ax25/sock.h
+++ b/include/patty/ax25/sock.h
@@ -3,6 +3,9 @@
 
 #include <patty/timer.h>
 
+/*
+ * Default socket parameters for all versions of AX.25 <=2.0
+ */
 #define PATTY_AX25_SOCK_DEFAULT_KEEPALIVE (1000 * 30)
 #define PATTY_AX25_SOCK_DEFAULT_DELAY      3000
 
@@ -14,26 +17,32 @@
    | PATTY_AX25_PARAM_HDLC_XADDR | PATTY_AX25_PARAM_HDLC_MODULO_8 \
    | PATTY_AX25_PARAM_HDLC_TEST  | PATTY_AX25_PARAM_HDLC_SYNC_TX)
 
+#define PATTY_AX25_SOCK_DEFAULT_I_LEN   256
+#define PATTY_AX25_SOCK_DEFAULT_WINDOW    4
+#define PATTY_AX25_SOCK_DEFAULT_RETRY    10
+#define PATTY_AX25_SOCK_DEFAULT_ACK    3000
+
+/*
+ * Default socket parameters for AX.25 v2.2
+ */
 #define PATTY_AX25_SOCK_2_2_DEFAULT_HDLC \
     (PATTY_AX25_PARAM_HDLC_REJ         | PATTY_AX25_PARAM_HDLC_SREJ \
    | PATTY_AX25_PARAM_HDLC_XADDR       | PATTY_AX25_PARAM_HDLC_MODULO_128 \
    | PATTY_AX25_PARAM_HDLC_TEST        | PATTY_AX25_PARAM_HDLC_FCS_16 \
    | PATTY_AX25_PARAM_HDLC_SYNC_TX)
 
+#define PATTY_AX25_SOCK_2_2_DEFAULT_I_LEN  256
+#define PATTY_AX25_SOCK_2_2_DEFAULT_WINDOW  32
+
+/*
+ * Default socket parameters for AX.25 v2.2 prior to negotiation
+ */
 #define PATTY_AX25_SOCK_2_2_MAX_HDLC \
     (PATTY_AX25_PARAM_HDLC_REJ         | PATTY_AX25_PARAM_HDLC_SREJ \
    | PATTY_AX25_PARAM_HDLC_XADDR       | PATTY_AX25_PARAM_HDLC_MODULO_128 \
    | PATTY_AX25_PARAM_HDLC_TEST        | PATTY_AX25_PARAM_HDLC_FCS_16 \
    | PATTY_AX25_PARAM_HDLC_SYNC_TX     | PATTY_AX25_PARAM_HDLC_SREJ_MULTI)
 
-#define PATTY_AX25_SOCK_DEFAULT_I_LEN   256
-#define PATTY_AX25_SOCK_DEFAULT_WINDOW    4
-#define PATTY_AX25_SOCK_DEFAULT_RETRY    10
-#define PATTY_AX25_SOCK_DEFAULT_ACK    3000
-
-#define PATTY_AX25_SOCK_2_2_DEFAULT_I_LEN  256
-#define PATTY_AX25_SOCK_2_2_DEFAULT_WINDOW  32
-
 #define PATTY_AX25_SOCK_2_2_MAX_I_LEN  1536
 #define PATTY_AX25_SOCK_2_2_MAX_WINDOW  127