diff --git a/athom-smart-plug.yaml b/athom-smart-plug.yaml
index 9995b27..0d2ab7a 100644
--- a/athom-smart-plug.yaml
+++ b/athom-smart-plug.yaml
@@ -114,20 +114,19 @@ sensor:
     internal: true
 
   - platform: wifi_signal
-    name: "WiFi Signal"
+    name: "WiFi Signal dB"
     id: wifi_signal_db
-    update_interval: 60s
-    entity_category: diagnostic
-    internal: true
+    update_interval: "${update_interval}"
+    entity_category: "diagnostic"
 
-  # Reports the WiFi signal strength in %
   - platform: copy
     source_id: wifi_signal_db
-    name: "WiFi Strength"
+    name: "WiFi Signal Percent"
     filters:
       - lambda: return min(max(2 * (x + 100.0), 0.0), 100.0);
-    unit_of_measurement: "%"
-    entity_category: diagnostic
+    unit_of_measurement: "Signal %"
+    entity_category: "diagnostic"
+    device_class: ""
 
   - platform: cse7766
     current: