diff --git a/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts b/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts
index 0e210af300e..5334d628f1b 100644
--- a/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts
+++ b/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts
@@ -12,10 +12,15 @@ import {
 } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
-
-import { WitnessConfigSchema } from '@xyo-network/witness-model'
-import { WitnessObserveQuerySchema, WitnessQuery, WitnessQueryBase } from '@xyo-network/witness-model'
-import { WitnessModule, WitnessModuleEventData, WitnessParams } from '@xyo-network/witness-model'
+import {
+  WitnessConfigSchema,
+  WitnessModule,
+  WitnessModuleEventData,
+  WitnessObserveQuerySchema,
+  WitnessParams,
+  WitnessQuery,
+  WitnessQueryBase,
+} from '@xyo-network/witness-model'
 
 creatableModule()
 export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData>
diff --git a/packages/modules/packages/witness/packages/abstract/src/index.ts b/packages/modules/packages/witness/packages/abstract/src/index.ts
index 436c815d7a0..9f4895987c8 100644
--- a/packages/modules/packages/witness/packages/abstract/src/index.ts
+++ b/packages/modules/packages/witness/packages/abstract/src/index.ts
@@ -1,2 +1 @@
 export * from './AbstractWitness'
-
diff --git a/packages/modules/packages/witness/packages/timestamp/src/TimestampWitness.ts b/packages/modules/packages/witness/packages/timestamp/src/TimestampWitness.ts
index 40dd9f5e0fb..a7ce9825a79 100644
--- a/packages/modules/packages/witness/packages/timestamp/src/TimestampWitness.ts
+++ b/packages/modules/packages/witness/packages/timestamp/src/TimestampWitness.ts
@@ -1,7 +1,6 @@
+import { AbstractWitness } from '@xyo-network/abstract-witness'
 import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
-
-import { AbstractWitness } from '@xyo-network/abstract-witness'
 import { WitnessParams } from '@xyo-network/witness-model'
 
 export abstract class TimestampWitness<P extends WitnessParams = WitnessParams> extends AbstractWitness<P> {
diff --git a/packages/modules/packages/witness/packages/timestamp/src/index.ts b/packages/modules/packages/witness/packages/timestamp/src/index.ts
index b05d2febaee..89401e8485a 100644
--- a/packages/modules/packages/witness/packages/timestamp/src/index.ts
+++ b/packages/modules/packages/witness/packages/timestamp/src/index.ts
@@ -1,2 +1 @@
 export * from './TimestampWitness'
-
diff --git a/packages/modules/packages/witness/packages/wrapper/src/WitnessWrapper.ts b/packages/modules/packages/witness/packages/wrapper/src/WitnessWrapper.ts
index b47b2a78518..3b4d71f3c8e 100644
--- a/packages/modules/packages/witness/packages/wrapper/src/WitnessWrapper.ts
+++ b/packages/modules/packages/witness/packages/wrapper/src/WitnessWrapper.ts
@@ -1,9 +1,7 @@
 import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-
-import { WitnessObserveQuery, WitnessObserveQuerySchema } from '@xyo-network/witness-model'
-import { Witness } from '@xyo-network/witness-model'
+import { Witness, WitnessObserveQuery, WitnessObserveQuerySchema } from '@xyo-network/witness-model'
 
 constructableModuleWrapper()
 export class WitnessWrapper extends ModuleWrapper implements Witness {
diff --git a/packages/modules/packages/witness/src/index.ts b/packages/modules/packages/witness/src/index.ts
index 914b2508e9b..66eef304cde 100644
--- a/packages/modules/packages/witness/src/index.ts
+++ b/packages/modules/packages/witness/src/index.ts
@@ -2,4 +2,3 @@ export * from '@xyo-network/abstract-witness'
 export * from '@xyo-network/witness-model'
 export * from '@xyo-network/witness-timestamp'
 export * from '@xyo-network/witness-wrapper'
-