diff --git a/pkg/service/audit_events.go b/pkg/service/audit_events.go
index 1dfffda..8dfaf6e 100644
--- a/pkg/service/audit_events.go
+++ b/pkg/service/audit_events.go
@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"io"
 
 	"git.itzana.me/strafesnet/go-grpc/users"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
@@ -43,18 +44,16 @@ func (svc *Service) CreateMapfixAuditComment(ctx context.Context, req api.Create
 		}
 	}
 
-	data := []byte{}
-	_, err = req.Read(data)
+	data, err := io.ReadAll(req)
 	if err != nil {
 		return err
 	}
-	Comment := string(data)
 
 	event_data := model.AuditEventDataComment{
-		Comment: Comment,
+		Comment: string(data),
 	}
 
-	EventData, err := json.Marshal(event_data)
+	EventData, err := json.Marshal(&event_data)
 	if err != nil {
 		return err
 	}
@@ -173,18 +172,16 @@ func (svc *Service) CreateSubmissionAuditComment(ctx context.Context, req api.Cr
 		}
 	}
 
-	data := []byte{}
-	_, err = req.Read(data)
+	data, err := io.ReadAll(req)
 	if err != nil {
 		return err
 	}
-	Comment := string(data)
 
 	event_data := model.AuditEventDataComment{
-		Comment: Comment,
+		Comment: string(data),
 	}
 
-	EventData, err := json.Marshal(event_data)
+	EventData, err := json.Marshal(&event_data)
 	if err != nil {
 		return err
 	}