diff --git a/json-schema/job-data.schema.json b/json-schema/job-data.schema.json
index b1627e6..37f66be 100644
--- a/json-schema/job-data.schema.json
+++ b/json-schema/job-data.schema.json
@@ -1,6 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-metric.schema.json",
     "title": "Job metric data",
     "description": "Meta data information of a HPC job",
     "type": "object",
@@ -126,7 +125,11 @@
             "#ref": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-metric-data.schema.json"
         }
     },
-    "required": [ "mem_used", "flops_any", "mem_bw", "net_bw", "file_bw" ]
-
-}
+    "required": [
+        "mem_used",
+        "flops_any",
+        "mem_bw",
+        "net_bw",
+        "file_bw"
+    ]
 }
diff --git a/json-schema/job-meta.schema.json b/json-schema/job-meta.schema.json
index 15902fc..95e2291 100644
--- a/json-schema/job-meta.schema.json
+++ b/json-schema/job-meta.schema.json
@@ -1,6 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-meta.schema.json",
     "title": "Job meta data",
     "description": "Meta data information of a HPC job",
     "type": "object",
@@ -34,7 +33,12 @@
         "job_state": {
             "description": "Final state of job",
             "type": "string",
-            "enum": [ "completed", "failed", "canceled", "timeout" ]
+            "enum": [
+                "completed",
+                "failed",
+                "canceled",
+                "timeout"
+            ]
         },
         "start_time": {
             "description": "Start epoch time stamp in seconds",
@@ -73,7 +77,10 @@
                         "type": "string"
                     }
                 },
-                "required": [ "name", "type" ]
+                "required": [
+                    "name",
+                    "type"
+                ]
             },
             "uniqueItems": true
         },
@@ -202,8 +209,26 @@
                     "#ref": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-statistic.schema.json"
                 }
             },
-            "required": [ "mem_used", "flops_any", "mem_bw", "net_bw", "file_bw" ]
+            "required": [
+                "mem_used",
+                "flops_any",
+                "mem_bw",
+                "net_bw",
+                "file_bw"
+            ]
         }
     },
-    "required": [ "job_id", "user_id", "project_id", "cluster_id", "num_nodes", "start_time", "stop_time", "duration", "nodes", "tags", "statistics" ]
+    "required": [
+        "job_id",
+        "user_id",
+        "project_id",
+        "cluster_id",
+        "num_nodes",
+        "start_time",
+        "stop_time",
+        "duration",
+        "nodes",
+        "tags",
+        "statistics"
+    ]
 }
diff --git a/json-schema/job-metric-data.schema.json b/json-schema/job-metric-data.schema.json
index 06dac01..8d0cbb5 100644
--- a/json-schema/job-metric-data.schema.json
+++ b/json-schema/job-metric-data.schema.json
@@ -1,6 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-metric.schema.json",
     "title": "Job metric data",
     "description": "Metric data of a HPC job",
     "type": "object",
@@ -12,10 +11,14 @@
         "scope": {
             "description": "",
             "type": "string",
-            "enum": [ "node", "cpu", "socket" ]
+            "enum": [
+                "node",
+                "cpu",
+                "socket"
+            ]
         },
         "timestep": {
-            "description": "",
+            "description": "Measurement interval in seconds",
             "type": "integer"
         },
         "series": {
@@ -30,7 +33,7 @@
                     "id": {
                         "type": "integer"
                     },
-                    "statistic": {
+                    "statistics": {
                         "type": "object",
                         "properties": {
                             "avg": {
@@ -49,7 +52,11 @@
                                 "minimum": 0
                             }
                         },
-                        "required": [ "avg", "min", "max" ]
+                        "required": [
+                            "avg",
+                            "min",
+                            "max"
+                        ]
                     },
                     "data": {
                         "type": "array",
@@ -60,9 +67,17 @@
                         "minItems": 1
                     }
                 },
-                "required": [ "node_id", "data" ]
+                "required": [
+                    "node_id",
+                    "data"
+                ]
             }
         }
     },
-    "required": [ "unit", "scope", "timestep", "series" ]
+    "required": [
+        "unit",
+        "scope",
+        "timestep",
+        "series"
+    ]
 }
diff --git a/json-schema/job-statistic.schema.json b/json-schema/job-statistic.schema.json
index 7453508..a5e0627 100644
--- a/json-schema/job-statistic.schema.json
+++ b/json-schema/job-statistic.schema.json
@@ -1,6 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "http://example.com/job-statistic.schema.json",
     "title": "Job statistics",
     "description": "Format specification for job metric statistics",
     "type": "object",
@@ -25,5 +24,10 @@
             "minimum": 0
         }
     },
-    "required": [ "unit", "avg", "min", "max" ]
+    "required": [
+        "unit",
+        "avg",
+        "min",
+        "max"
+    ]
 }