diff --git a/lib/Hoymiles/src/inverters/HM_1CH.cpp b/lib/Hoymiles/src/inverters/HM_1CH.cpp
index 5de99138..2311330e 100644
--- a/lib/Hoymiles/src/inverters/HM_1CH.cpp
+++ b/lib/Hoymiles/src/inverters/HM_1CH.cpp
@@ -25,7 +25,7 @@ bool HM_1CH::isValidSerial(uint64_t serial)
 
 String HM_1CH::typeName()
 {
-    return String(F("HM-300, HM-350, HM-400"));
+    return F("HM-300, HM-350, HM-400");
 }
 
 const byteAssign_t* HM_1CH::getByteAssignment()
diff --git a/lib/Hoymiles/src/inverters/HM_2CH.cpp b/lib/Hoymiles/src/inverters/HM_2CH.cpp
index aea62cb3..cf2c5536 100644
--- a/lib/Hoymiles/src/inverters/HM_2CH.cpp
+++ b/lib/Hoymiles/src/inverters/HM_2CH.cpp
@@ -25,7 +25,7 @@ bool HM_2CH::isValidSerial(uint64_t serial)
 
 String HM_2CH::typeName()
 {
-    return String(F("HM-600, HM-700, HM-800"));
+    return F("HM-600, HM-700, HM-800");
 }
 
 const byteAssign_t* HM_2CH::getByteAssignment()
diff --git a/lib/Hoymiles/src/inverters/HM_4CH.cpp b/lib/Hoymiles/src/inverters/HM_4CH.cpp
index 908f163c..bda9592d 100644
--- a/lib/Hoymiles/src/inverters/HM_4CH.cpp
+++ b/lib/Hoymiles/src/inverters/HM_4CH.cpp
@@ -25,7 +25,7 @@ bool HM_4CH::isValidSerial(uint64_t serial)
 
 String HM_4CH::typeName()
 {
-    return String(F("HM-1000, HM-1200, HM-1500"));
+    return F("HM-1000, HM-1200, HM-1500");
 }
 
 const byteAssign_t* HM_4CH::getByteAssignment()
diff --git a/lib/Hoymiles/src/parser/AlarmLogParser.cpp b/lib/Hoymiles/src/parser/AlarmLogParser.cpp
index a5d09366..4958b6a7 100644
--- a/lib/Hoymiles/src/parser/AlarmLogParser.cpp
+++ b/lib/Hoymiles/src/parser/AlarmLogParser.cpp
@@ -59,214 +59,214 @@ void AlarmLogParser::getLogEntry(uint8_t entryId, AlarmLogEntry_t* entry)
 
     switch (entry->MessageId) {
     case 1:
-        entry->Message = String(F("Inverter start"));
+        entry->Message = F("Inverter start");
         break;
     case 2:
-        entry->Message = String(F("DTU command failed"));
+        entry->Message = F("DTU command failed");
         break;
     case 121:
-        entry->Message = String(F("Over temperature protection"));
+        entry->Message = F("Over temperature protection");
         break;
     case 124:
-        entry->Message = String(F("Shut down by remote control"));
+        entry->Message = F("Shut down by remote control");
         break;
     case 125:
-        entry->Message = String(F("Grid configuration parameter error"));
+        entry->Message = F("Grid configuration parameter error");
         break;
     case 126:
-        entry->Message = String(F("Software error code 126"));
+        entry->Message = F("Software error code 126");
         break;
     case 127:
-        entry->Message = String(F("Firmware error"));
+        entry->Message = F("Firmware error");
         break;
     case 128:
-        entry->Message = String(F("Software error code 128"));
+        entry->Message = F("Software error code 128");
         break;
     case 129:
-        entry->Message = String(F("Abnormal bias"));
+        entry->Message = F("Abnormal bias");
         break;
     case 130:
-        entry->Message = String(F("Offline"));
+        entry->Message = F("Offline");
         break;
     case 141:
-        entry->Message = String(F("Grid: Grid overvoltage"));
+        entry->Message = F("Grid: Grid overvoltage");
         break;
     case 142:
-        entry->Message = String(F("Grid: 10 min value grid overvoltage"));
+        entry->Message = F("Grid: 10 min value grid overvoltage");
         break;
     case 143:
-        entry->Message = String(F("Grid: Grid undervoltage"));
+        entry->Message = F("Grid: Grid undervoltage");
         break;
     case 144:
-        entry->Message = String(F("Grid: Grid overfrequency"));
+        entry->Message = F("Grid: Grid overfrequency");
         break;
     case 145:
-        entry->Message = String(F("Grid: Grid underfrequency"));
+        entry->Message = F("Grid: Grid underfrequency");
         break;
     case 146:
-        entry->Message = String(F("Grid: Rapid grid frequency change rate"));
+        entry->Message = F("Grid: Rapid grid frequency change rate");
         break;
     case 147:
-        entry->Message = String(F("Grid: Power grid outage"));
+        entry->Message = F("Grid: Power grid outage");
         break;
     case 148:
-        entry->Message = String(F("Grid: Grid disconnection"));
+        entry->Message = F("Grid: Grid disconnection");
         break;
     case 149:
-        entry->Message = String(F("Grid: Island detected"));
+        entry->Message = F("Grid: Island detected");
         break;
     case 205:
-        entry->Message = String(F("MPPT-A: Input overvoltage"));
+        entry->Message = F("MPPT-A: Input overvoltage");
         break;
     case 206:
-        entry->Message = String(F("MPPT-B: Input overvoltage"));
+        entry->Message = F("MPPT-B: Input overvoltage");
         break;
     case 207:
-        entry->Message = String(F("MPPT-A: Input undervoltage"));
+        entry->Message = F("MPPT-A: Input undervoltage");
         break;
     case 208:
-        entry->Message = String(F("MPPT-B: Input undervoltage"));
+        entry->Message = F("MPPT-B: Input undervoltage");
         break;
     case 209:
-        entry->Message = String(F("PV-1: No input"));
+        entry->Message = F("PV-1: No input");
         break;
     case 210:
-        entry->Message = String(F("PV-2: No input"));
+        entry->Message = F("PV-2: No input");
         break;
     case 211:
-        entry->Message = String(F("PV-3: No input"));
+        entry->Message = F("PV-3: No input");
         break;
     case 212:
-        entry->Message = String(F("PV-4: No input"));
+        entry->Message = F("PV-4: No input");
         break;
     case 213:
-        entry->Message = String(F("MPPT-A: PV-1 & PV-2 abnormal wiring"));
+        entry->Message = F("MPPT-A: PV-1 & PV-2 abnormal wiring");
         break;
     case 214:
-        entry->Message = String(F("MPPT-B: PV-3 & PV-4 abnormal wiring"));
+        entry->Message = F("MPPT-B: PV-3 & PV-4 abnormal wiring");
         break;
     case 215:
-        entry->Message = String(F("PV-1: Input overvoltage"));
+        entry->Message = F("PV-1: Input overvoltage");
         break;
     case 216:
-        entry->Message = String(F("PV-1: Input undervoltage"));
+        entry->Message = F("PV-1: Input undervoltage");
         break;
     case 217:
-        entry->Message = String(F("PV-2: Input overvoltage"));
+        entry->Message = F("PV-2: Input overvoltage");
         break;
     case 218:
-        entry->Message = String(F("PV-2: Input undervoltage"));
+        entry->Message = F("PV-2: Input undervoltage");
         break;
     case 219:
-        entry->Message = String(F("PV-3: Input overvoltage"));
+        entry->Message = F("PV-3: Input overvoltage");
         break;
     case 220:
-        entry->Message = String(F("PV-3: Input undervoltage"));
+        entry->Message = F("PV-3: Input undervoltage");
         break;
     case 221:
-        entry->Message = String(F("PV-4: Input overvoltage"));
+        entry->Message = F("PV-4: Input overvoltage");
         break;
     case 222:
-        entry->Message = String(F("PV-4: Input undervoltage"));
+        entry->Message = F("PV-4: Input undervoltage");
         break;
     case 301:
-        entry->Message = String(F("Hardware error code 301"));
+        entry->Message = F("Hardware error code 301");
         break;
     case 302:
-        entry->Message = String(F("Hardware error code 302"));
+        entry->Message = F("Hardware error code 302");
         break;
     case 303:
-        entry->Message = String(F("Hardware error code 303"));
+        entry->Message = F("Hardware error code 303");
         break;
     case 304:
-        entry->Message = String(F("Hardware error code 304"));
+        entry->Message = F("Hardware error code 304");
         break;
     case 305:
-        entry->Message = String(F("Hardware error code 305"));
+        entry->Message = F("Hardware error code 305");
         break;
     case 306:
-        entry->Message = String(F("Hardware error code 306"));
+        entry->Message = F("Hardware error code 306");
         break;
     case 307:
-        entry->Message = String(F("Hardware error code 307"));
+        entry->Message = F("Hardware error code 307");
         break;
     case 308:
-        entry->Message = String(F("Hardware error code 308"));
+        entry->Message = F("Hardware error code 308");
         break;
     case 309:
-        entry->Message = String(F("Hardware error code 309"));
+        entry->Message = F("Hardware error code 309");
         break;
     case 310:
-        entry->Message = String(F("Hardware error code 310"));
+        entry->Message = F("Hardware error code 310");
         break;
     case 311:
-        entry->Message = String(F("Hardware error code 311"));
+        entry->Message = F("Hardware error code 311");
         break;
     case 312:
-        entry->Message = String(F("Hardware error code 312"));
+        entry->Message = F("Hardware error code 312");
         break;
     case 313:
-        entry->Message = String(F("Hardware error code 313"));
+        entry->Message = F("Hardware error code 313");
         break;
     case 314:
-        entry->Message = String(F("Hardware error code 314"));
+        entry->Message = F("Hardware error code 314");
         break;
     case 5041:
-        entry->Message = String(F("Error code-04 Port 1"));
+        entry->Message = F("Error code-04 Port 1");
         break;
     case 5042:
-        entry->Message = String(F("Error code-04 Port 2"));
+        entry->Message = F("Error code-04 Port 2");
         break;
     case 5043:
-        entry->Message = String(F("Error code-04 Port 3"));
+        entry->Message = F("Error code-04 Port 3");
         break;
     case 5044:
-        entry->Message = String(F("Error code-04 Port 4"));
+        entry->Message = F("Error code-04 Port 4");
         break;
     case 5051:
-        entry->Message = String(F("PV Input 1 Overvoltage/Undervoltage"));
+        entry->Message = F("PV Input 1 Overvoltage/Undervoltage");
         break;
     case 5052:
-        entry->Message = String(F("PV Input 2 Overvoltage/Undervoltage"));
+        entry->Message = F("PV Input 2 Overvoltage/Undervoltage");
         break;
     case 5053:
-        entry->Message = String(F("PV Input 3 Overvoltage/Undervoltage"));
+        entry->Message = F("PV Input 3 Overvoltage/Undervoltage");
         break;
     case 5054:
-        entry->Message = String(F("PV Input 4 Overvoltage/Undervoltage"));
+        entry->Message = F("PV Input 4 Overvoltage/Undervoltage");
         break;
     case 5060:
-        entry->Message = String(F("Abnormal bias"));
+        entry->Message = F("Abnormal bias");
         break;
     case 5070:
-        entry->Message = String(F("Over temperature protection"));
+        entry->Message = F("Over temperature protection");
         break;
     case 5080:
-        entry->Message = String(F("Grid Overvoltage/Undervoltage"));
+        entry->Message = F("Grid Overvoltage/Undervoltage");
         break;
     case 5090:
-        entry->Message = String(F("Grid Overfrequency/Underfrequency"));
+        entry->Message = F("Grid Overfrequency/Underfrequency");
         break;
     case 5100:
-        entry->Message = String(F("Island detected"));
+        entry->Message = F("Island detected");
         break;
     case 5120:
-        entry->Message = String(F("EEPROM reading and writing error"));
+        entry->Message = F("EEPROM reading and writing error");
         break;
     case 5150:
-        entry->Message = String(F("10 min value grid overvoltage"));
+        entry->Message = F("10 min value grid overvoltage");
         break;
     case 5200:
-        entry->Message = String(F("Firmware error"));
+        entry->Message = F("Firmware error");
         break;
     case 8310:
-        entry->Message = String(F("Shut down"));
+        entry->Message = F("Shut down");
         break;
     case 9000:
-        entry->Message = String(F("Microinverter is suspected of being stolen"));
+        entry->Message = F("Microinverter is suspected of being stolen");
         break;
     default:
-        entry->Message = String(F("Unknown"));
+        entry->Message = F("Unknown");
         break;
     }
 }
diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp
index 732f3ec2..b975043c 100644
--- a/src/NetworkSettings.cpp
+++ b/src/NetworkSettings.cpp
@@ -375,7 +375,7 @@ String NetworkSettingsClass::macAddress()
         return WiFi.macAddress();
         break;
     default:
-        return String("");
+        return "";
     }
 }