diff --git a/nmcli/data/general.py b/nmcli/data/general.py
index 3b5f6d3..aee47be 100644
--- a/nmcli/data/general.py
+++ b/nmcli/data/general.py
@@ -39,31 +39,21 @@ def to_json(self):
 
     @classmethod
     def parse(cls, text: str) -> General:
-        #pattern = r'^([\S\s]+)\s{2}(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*'
-
-        state_r = r'(?P<state>.+)'
-        connectivity_r = r'(?P<connectivity>\S+)'
-        wifi_hw_r = r'(?P<wifi_hw>\S+)'
-        wifi_r = r'(?P<wifi>\S+)'
-        wwan_hw_r = r'(?P<wwan_hw>\S+)'
-        wwan_r = r'(?P<wwan>\S+)'
-        metered_r = r'(?:  (?P<metered>.+)?)?'
-
         pattern = (
-	        r'^'
-	        + state_r
-	        + r'  '
-	        + connectivity_r
-	        + r'\s+'
-	        + wifi_hw_r
-	        + r'  '
-	        + wifi_r
-	        + r'  '
-	        + wwan_hw_r
-	        + r'  '
-	        + wwan_r
-	        + metered_r
-	        + r'$'
+            r'^'
+            + r'(?P<state>.+)'
+            + r'  '
+            + r'(?P<connectivity>\S+)'
+            + r'\s+'
+            + r'(?P<wifi_hw>\S+)'
+            + r'  '
+            + r'(?P<wifi>\S+)'
+            + r'  '
+            + r'(?P<wwan_hw>\S+)'
+            + r'  '
+            + r'(?P<wwan>\S+)'
+            + r'(?:  (?P<metered>.+)?)?'
+            + r'$'
         )
 
         m = re.search(pattern, text)