             if (df_present())
                 df_append((const char*) rf12_data - 2, rf12_len + 2);
 #endif
-                if (((rf12_hdr & (RF12_HDR_MASK | RF12_HDR_DST)) <= MAX_NODES) &&        // Source node packets only
-                     (nodes[(rf12_hdr & RF12_HDR_MASK)] == 0xFF)) {
-                        byte len = 32;
-                        if (rf12_data[0] == 0xFF)                                                                // New nodes cannot be learned if packet begins 0xFF
-                            rf12_data[0] = 0xFE;                                                                     // so lets drop the low order bit in byte 0
-                        showString(PSTR("New Node "));
-                        showByte(rf12_hdr & RF12_HDR_MASK);
-                        Serial.println();
-                        nodes[(rf12_hdr & RF12_HDR_MASK)] = 0;
-                        if (rf12_len < 32)
-                            len = rf12_len;
-                            for (byte i = 0; i < len; ++i) {    // variable n
-                            eeprom_write_byte(RF12_EEPROM_ADDR + (((rf12_hdr & RF12_HDR_MASK) * 32) + i), rf12_data[i]);
-                        }
+            if (((rf12_hdr & (RF12_HDR_MASK | RF12_HDR_DST)) <= MAX_NODES) &&
+                    // Source node packets only
+                    (nodes[(rf12_hdr & RF12_HDR_MASK)] == 0xFF)) {
+                // New nodes cannot be learned if packet begins 0xFF
+                if (rf12_data[0] == 0xFF)
+                    // so lets drop the low order bit in byte 0
+                    rf12_data[0] = 0xFE;
+                showString(PSTR("New Node "));
+                showByte(rf12_hdr & RF12_HDR_MASK);
+                Serial.println();
+                nodes[rf12_hdr & RF12_HDR_MASK] = 0;
+                byte len = rf12_len < 32 ? rf12_len : 32;
+                for (byte i = 0; i < len; ++i) {    // variable n
+                    eeprom_write_byte(RF12_EEPROM_ADDR + (((rf12_hdr & RF12_HDR_MASK) * 32) + i), rf12_data[i]);
                 }
+            }
 
             if (RF12_WANTS_ACK && (config.collect_mode) == 0) {
                 showString(PSTR(" -> ack\n"));
                 testCounter = 0;
 
-                if ((rf12_hdr & (RF12_HDR_MASK | RF12_HDR_DST)) == 31) {                    // Special Node 31 source node
+                if ((rf12_hdr & (RF12_HDR_MASK | RF12_HDR_DST)) == 31) {
+                    // Special Node 31 source node
                     for (byte i = 1; i <= MAX_NODES; i++) {
                         if (nodes[i] == 0xFF) {
-                            testbuf[0] = i + 0xE0;                                                                          // Change Node number request - matched in RF12Tune3
+                            testbuf[0] = i + 0xE0;
+                            // Change Node number request - matched in RF12Tune3
                             testCounter = 1;
                             showString(PSTR("Node allocation "));
                             showByte(i);

    Serial.begin(SERIAL_BAUD);
    displayVersion();

    if (rf12_configSilent())
        loadConfig();
    else {
        memset(&config, 0, sizeof config);
        config.nodeId = 0x81;       // 868 MHz, node 1
        config.group = 0xD4;        // default group 212

                    }
                    Serial.println();
                    showString(PSTR("Restored\n"));
                }
                if (rf12_configSilent())
                    loadConfig();
                else
