diff --git a/proto/audit/details/dns_details.proto b/proto/audit/details/dns_details.proto
index f820840..5229643 100644
--- a/proto/audit/details/dns_details.proto
+++ b/proto/audit/details/dns_details.proto
@@ -1,43 +1,43 @@
 syntax = "proto3";
 
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.audit.details";
-option java_outer_classname = "HandlerEventProto";
-option csharp_namespace = "INetMock.Client.Audit.Details";
-
 package inetmock.audit.details;
 
+option csharp_namespace = "INetMock.Client.Audit.Details";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
+option java_multiple_files = true;
+option java_outer_classname = "HandlerEventProto";
+option java_package = "com.github.baez90.inetmock.audit.details";
+
 enum DNSOpCode {
-    Query = 0;
-    Status = 2;
-    Notify = 4;
-    Update = 5;
+  Query = 0;
+  Status = 2;
+  Notify = 4;
+  Update = 5;
 }
 
 enum ResourceRecordType {
-    UnknownRR = 0;
-    A = 1;
-    NS = 2;
-    CNAME = 5;
-    SOA = 6;
-    PTR = 12;
-    HINFO = 13;
-    MINFO = 14;
-    MX = 15;
-    TXT = 16;
-    RP = 17;
-    AAAA = 28;
-    SRV = 33;
-    NAPTR = 35;
+  UnknownRR = 0;
+  A = 1;
+  NS = 2;
+  CNAME = 5;
+  SOA = 6;
+  PTR = 12;
+  HINFO = 13;
+  MINFO = 14;
+  MX = 15;
+  TXT = 16;
+  RP = 17;
+  AAAA = 28;
+  SRV = 33;
+  NAPTR = 35;
 }
 
 message DNSQuestionEntity {
-    ResourceRecordType type = 1;
-    string name = 2;
+  ResourceRecordType type = 1;
+  string name = 2;
 }
 
 message DNSDetailsEntity {
-    DNSOpCode opcode = 1;
-    repeated DNSQuestionEntity questions = 2;
+  DNSOpCode opcode = 1;
+  repeated DNSQuestionEntity questions = 2;
 }
diff --git a/proto/audit/details/http_details.proto b/proto/audit/details/http_details.proto
index e5e5d7a..eef9806 100644
--- a/proto/audit/details/http_details.proto
+++ b/proto/audit/details/http_details.proto
@@ -1,33 +1,33 @@
 syntax = "proto3";
 
-option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.audit.details";
-option java_outer_classname = "HandlerEventProto";
-option csharp_namespace = "INetMock.Client.Audit.Details";
-
 package inetmock.audit.details;
 
+option csharp_namespace = "INetMock.Client.Audit.Details";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/audit/details";
+option java_multiple_files = true;
+option java_outer_classname = "HandlerEventProto";
+option java_package = "com.github.baez90.inetmock.audit.details";
+
 enum HTTPMethod {
-    GET = 0;
-    HEAD = 1;
-    POST = 2;
-    PUT = 3;
-    DELETE = 4;
-    CONNECT = 5;
-    OPTIONS = 6;
-    TRACE = 7;
-    PATCH = 8;
+  GET = 0;
+  HEAD = 1;
+  POST = 2;
+  PUT = 3;
+  DELETE = 4;
+  CONNECT = 5;
+  OPTIONS = 6;
+  TRACE = 7;
+  PATCH = 8;
 }
 
 message HTTPHeaderValue {
-    repeated string values = 1;
+  repeated string values = 1;
 }
 
 message HTTPDetailsEntity {
-    HTTPMethod method = 1;
-    string host = 2;
-    string uri = 3;
-    string proto = 4;
-    map<string, HTTPHeaderValue> headers = 5;
+  HTTPMethod method = 1;
+  string host = 2;
+  string uri = 3;
+  string proto = 4;
+  map<string, HTTPHeaderValue> headers = 5;
 }
diff --git a/proto/audit/event_entity.proto b/proto/audit/event_entity.proto
index 3b213ee..f438101 100644
--- a/proto/audit/event_entity.proto
+++ b/proto/audit/event_entity.proto
@@ -1,52 +1,52 @@
 syntax = "proto3";
 
+package inetmock.audit;
+
+option csharp_namespace = "INetMock.Client.Audit";
 option go_package = "gitlab.com/inetmock/inetmock/pkg/audit";
 option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.audit";
 option java_outer_classname = "HandlerEventProto";
-option csharp_namespace = "INetMock.Client.Audit";
-
-package inetmock.audit;
+option java_package = "com.github.baez90.inetmock.audit";
 
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
 enum TransportProtocol {
-    UNKNOWN_TRANSPORT = 0;
-    TCP = 1;
-    UDP = 2;
+  UNKNOWN_TRANSPORT = 0;
+  TCP = 1;
+  UDP = 2;
 }
 
 enum AppProtocol {
-    UNKNOWN_APPLICATION = 0;
-    DNS = 1;
-    HTTP = 2;
-    HTTP_PROXY = 3;
+  UNKNOWN_APPLICATION = 0;
+  DNS = 1;
+  HTTP = 2;
+  HTTP_PROXY = 3;
 }
 
 enum TLSVersion {
-    SSLv30 = 0;
-    TLS10 = 1;
-    TLS11 = 2;
-    TLS12 = 3;
-    TLS13 = 4;
+  SSLv30 = 0;
+  TLS10 = 1;
+  TLS11 = 2;
+  TLS12 = 3;
+  TLS13 = 4;
 }
 
 message TLSDetailsEntity {
-    TLSVersion version = 1;
-    string cipherSuite = 2;
-    string serverName = 3;
+  TLSVersion version = 1;
+  string cipherSuite = 2;
+  string serverName = 3;
 }
 
 message EventEntity {
-    int64 id = 1;
-    google.protobuf.Timestamp timestamp = 2;
-    TransportProtocol transport = 3;
-    AppProtocol application = 4;
-    bytes sourceIP = 5;
-    bytes destinationIP = 6;
-    uint32 sourcePort = 7;
-    uint32 destinationPort = 8;
-    TLSDetailsEntity tls = 9;
-    google.protobuf.Any protocolDetails = 10;
+  int64 id = 1;
+  google.protobuf.Timestamp timestamp = 2;
+  TransportProtocol transport = 3;
+  AppProtocol application = 4;
+  bytes sourceIP = 5;
+  bytes destinationIP = 6;
+  uint32 sourcePort = 7;
+  uint32 destinationPort = 8;
+  TLSDetailsEntity tls = 9;
+  google.protobuf.Any protocolDetails = 10;
 }
diff --git a/proto/rpc/audit.proto b/proto/rpc/audit.proto
index 2bd2caa..ded0ae0 100644
--- a/proto/rpc/audit.proto
+++ b/proto/rpc/audit.proto
@@ -1,51 +1,49 @@
 syntax = "proto3";
 
-option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.rpc";
-option java_outer_classname = "AuditProto";
-option csharp_namespace = "INetMock.Client.Rpc";
-
-import 'audit/event_entity.proto';
-
 package inetmock.rpc;
 
+option csharp_namespace = "INetMock.Client.Rpc";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
+option java_multiple_files = true;
+option java_outer_classname = "AuditProto";
+option java_package = "com.github.baez90.inetmock.rpc";
+
+import "audit/event_entity.proto";
+
 enum FileOpenMode {
-    TRUNCATE = 0;
-    APPEND = 1;
+  TRUNCATE = 0;
+  APPEND = 1;
 }
 
 message WatchEventsRequest {
-    string watcherName = 1;
+  string watcherName = 1;
 }
 
 message RegisterFileSinkRequest {
-    string targetPath = 1;
+  string targetPath = 1;
 }
 
 message RegisterFileSinkResponse {
-    string resolvedPath = 1;
+  string resolvedPath = 1;
 }
 
 message RemoveFileSinkRequest {
-    string targetPath = 1;
+  string targetPath = 1;
 }
 
 message RemoveFileSinkResponse {
-    bool SinkGotRemoved = 1;
+  bool SinkGotRemoved = 1;
 }
 
-message ListSinksRequest {
-
-}
+message ListSinksRequest {}
 
 message ListSinksResponse {
-    repeated string sinks = 1;
+  repeated string sinks = 1;
 }
 
 service Audit {
-    rpc WatchEvents (WatchEventsRequest) returns (stream inetmock.audit.EventEntity);
-    rpc RegisterFileSink (RegisterFileSinkRequest) returns (RegisterFileSinkResponse);
-    rpc RemoveFileSink (RemoveFileSinkRequest) returns (RemoveFileSinkResponse);
-    rpc ListSinks(ListSinksRequest) returns (ListSinksResponse);
+  rpc WatchEvents(WatchEventsRequest) returns (stream inetmock.audit.EventEntity);
+  rpc RegisterFileSink(RegisterFileSinkRequest) returns (RegisterFileSinkResponse);
+  rpc RemoveFileSink(RemoveFileSinkRequest) returns (RemoveFileSinkResponse);
+  rpc ListSinks(ListSinksRequest) returns (ListSinksResponse);
 }
diff --git a/proto/rpc/health.proto b/proto/rpc/health.proto
index 193bc8c..5dea669 100644
--- a/proto/rpc/health.proto
+++ b/proto/rpc/health.proto
@@ -1,35 +1,34 @@
 syntax = "proto3";
 
-option go_package = "gitlab.com/inetmock/inetmock/internal/rpc";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.rpc";
-option java_outer_classname = "HealthProto";
-option csharp_namespace = "INetMock.Client.Rpc";
-
 package inetmock.rpc;
 
+option csharp_namespace = "INetMock.Client.Rpc";
+option go_package = "gitlab.com/inetmock/inetmock/internal/rpc";
+option java_multiple_files = true;
+option java_outer_classname = "HealthProto";
+option java_package = "com.github.baez90.inetmock.rpc";
+
 service Health {
-    rpc GetHealth (HealthRequest) returns (HealthResponse) {
-    }
+  rpc GetHealth(HealthRequest) returns (HealthResponse);
 }
 
 enum HealthState {
-    HEALTHY = 0;
-    INITIALIZING = 1;
-    UNHEALTHY = 2;
-    UNKNOWN = 3;
+  HEALTHY = 0;
+  INITIALIZING = 1;
+  UNHEALTHY = 2;
+  UNKNOWN = 3;
 }
 
 message HealthRequest {
-    repeated string components = 1;
+  repeated string components = 1;
 }
 
 message ComponentHealth {
-    HealthState State = 1;
-    string message = 2;
+  HealthState State = 1;
+  string message = 2;
 }
 
 message HealthResponse {
-    HealthState overallHealthState = 1;
-    map<string, ComponentHealth> componentsHealth = 2;
+  HealthState overallHealthState = 1;
+  map<string, ComponentHealth> componentsHealth = 2;
 }
diff --git a/proto/rpc/pcap.proto b/proto/rpc/pcap.proto
index 07ac7d2..3b41b5e 100644
--- a/proto/rpc/pcap.proto
+++ b/proto/rpc/pcap.proto
@@ -1,59 +1,53 @@
 syntax = "proto3";
 
-option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
-option java_multiple_files = true;
-option java_package = "com.github.baez90.inetmock.rpc";
-option java_outer_classname = "AuditProto";
-option csharp_namespace = "INetMock.Client.Rpc";
-
 package inetmock.rpc;
 
+option csharp_namespace = "INetMock.Client.Rpc";
+option go_package = "gitlab.com/inetmock/inetmock/pkg/rpc";
+option java_multiple_files = true;
+option java_outer_classname = "AuditProto";
+option java_package = "com.github.baez90.inetmock.rpc";
+
 import "google/protobuf/duration.proto";
 
-message ListAvailableDevicesRequest {
-
-}
+message ListAvailableDevicesRequest {}
 
 message ListAvailableDevicesResponse {
-
-    message PCAPDevice {
-        string name = 1;
-        repeated bytes addresses = 2;
-    }
-
-    repeated PCAPDevice availableDevices = 1;
+  message PCAPDevice {
+    string name = 1;
+    repeated bytes addresses = 2;
+  }
+  repeated PCAPDevice availableDevices = 1;
 }
 
-message ListRecordingsRequest {
-
-}
+message ListRecordingsRequest {}
 
 message ListRecordingsResponse {
-    repeated string subscriptions = 1;
+  repeated string subscriptions = 1;
 }
 
 message StartPCAPFileRecordRequest {
-    string device = 1;
-    string targetPath = 2;
-    bool promiscuous = 3;
-    google.protobuf.Duration readTimeout = 4;
+  string device = 1;
+  string targetPath = 2;
+  bool promiscuous = 3;
+  google.protobuf.Duration readTimeout = 4;
 }
 
 message StartPCAPFileRecordResponse {
-    string resolvedPath = 1;
+  string resolvedPath = 1;
 }
 
 message StopPCAPFileRecordRequest {
-    string consumerKey = 1;
+  string consumerKey = 1;
 }
 
 message StopPCAPFileRecordResponse {
-    bool removed = 1;
+  bool removed = 1;
 }
 
 service PCAP {
-    rpc ListAvailableDevices(ListAvailableDevicesRequest) returns (ListAvailableDevicesResponse);
-    rpc ListActiveRecordings(ListRecordingsRequest) returns (ListRecordingsResponse);
-    rpc StartPCAPFileRecording(StartPCAPFileRecordRequest) returns (StartPCAPFileRecordResponse);
-    rpc StopPCAPFileRecord(StopPCAPFileRecordRequest) returns (StopPCAPFileRecordResponse);
+  rpc ListAvailableDevices(ListAvailableDevicesRequest) returns (ListAvailableDevicesResponse);
+  rpc ListActiveRecordings(ListRecordingsRequest) returns (ListRecordingsResponse);
+  rpc StartPCAPFileRecording(StartPCAPFileRecordRequest) returns (StartPCAPFileRecordResponse);
+  rpc StopPCAPFileRecord(StopPCAPFileRecordRequest) returns (StopPCAPFileRecordResponse);
 }