diff --git a/nssa/core/src/account.rs b/nssa/core/src/account.rs
index 45e6e2c..c3d5580 100644
--- a/nssa/core/src/account.rs
+++ b/nssa/core/src/account.rs
@@ -1,4 +1,4 @@
-use crate::{NullifierPublicKey, program::ProgramId};
+use crate::program::ProgramId;
 use serde::{Deserialize, Serialize};
 
 pub type Nonce = u128;
diff --git a/nssa/core/src/circuit_io.rs b/nssa/core/src/circuit_io.rs
index 2473475..ecc25fc 100644
--- a/nssa/core/src/circuit_io.rs
+++ b/nssa/core/src/circuit_io.rs
@@ -40,7 +40,8 @@ impl PrivacyPreservingCircuitOutput {
 mod tests {
     use super::*;
     use crate::{
-        account::{Account, AccountWithMetadata, FingerPrint}, Commitment, Nullifier, NullifierPublicKey
+        Commitment, Nullifier, NullifierPublicKey,
+        account::{Account, AccountWithMetadata, FingerPrint},
     };
     use risc0_zkvm::serde::from_slice;
 
@@ -55,7 +56,7 @@ mod tests {
                         data: b"test data".to_vec(),
                         nonce: 18446744073709551614,
                     },
-                    is_authorized: true, 
+                    is_authorized: true,
                     fingerprint: FingerPrint::new([0; 32]),
                 },
                 AccountWithMetadata {
@@ -65,7 +66,7 @@ mod tests {
                         data: b"test data".to_vec(),
                         nonce: 9999999999999999999999,
                     },
-                    is_authorized: false, 
+                    is_authorized: false,
                     fingerprint: FingerPrint::new([1; 32]),
                 },
             ],
diff --git a/nssa/core/src/program.rs b/nssa/core/src/program.rs
index 48593d8..a4e6722 100644
--- a/nssa/core/src/program.rs
+++ b/nssa/core/src/program.rs
@@ -1,4 +1,4 @@
-use crate::account::{Account, AccountWithMetadata, FingerPrint};
+use crate::account::{Account, AccountWithMetadata};
 use risc0_zkvm::serde::Deserializer;
 use risc0_zkvm::{DeserializeOwned, guest::env};
 use serde::{Deserialize, Serialize};
diff --git a/nssa/src/address.rs b/nssa/src/address.rs
index 0dba65a..04bd99d 100644
--- a/nssa/src/address.rs
+++ b/nssa/src/address.rs
@@ -82,7 +82,6 @@ impl<'de> Deserialize<'de> for Address {
     }
 }
 
-
 impl From<&Address> for FingerPrint {
     fn from(address: &Address) -> Self {
         FingerPrint::new(address.value)
@@ -95,7 +94,6 @@ impl From<Address> for FingerPrint {
     }
 }
 
-
 #[cfg(test)]
 mod tests {
     use crate::{Address, address::AddressError};
diff --git a/nssa/src/privacy_preserving_transaction/circuit.rs b/nssa/src/privacy_preserving_transaction/circuit.rs
index c1afe39..82ba860 100644
--- a/nssa/src/privacy_preserving_transaction/circuit.rs
+++ b/nssa/src/privacy_preserving_transaction/circuit.rs
@@ -1,7 +1,7 @@
 use nssa_core::{
     MembershipProof, NullifierPublicKey, NullifierSecretKey, PrivacyPreservingCircuitInput,
     PrivacyPreservingCircuitOutput, SharedSecretKey,
-    account::{AccountWithMetadata, FingerPrint},
+    account::AccountWithMetadata,
     program::{InstructionData, ProgramOutput},
 };
 use risc0_zkvm::{ExecutorEnv, InnerReceipt, Receipt, default_prover};
@@ -90,7 +90,7 @@ fn execute_and_prove_program(
 mod tests {
     use nssa_core::{
         Commitment, EncryptionScheme, Nullifier,
-        account::{Account, AccountWithMetadata},
+        account::{Account, AccountWithMetadata, FingerPrint},
     };
 
     use crate::{
diff --git a/nssa/src/program.rs b/nssa/src/program.rs
index cf7c9da..d105f51 100644
--- a/nssa/src/program.rs
+++ b/nssa/src/program.rs
@@ -1,5 +1,5 @@
 use nssa_core::{
-    account::{Account, AccountWithMetadata, FingerPrint},
+    account::{Account, AccountWithMetadata},
     program::{InstructionData, ProgramId, ProgramOutput},
 };
 use program_methods::{AUTHENTICATED_TRANSFER_ELF, AUTHENTICATED_TRANSFER_ID};
diff --git a/nssa/src/public_transaction/transaction.rs b/nssa/src/public_transaction/transaction.rs
index 64e0707..14dcc6f 100644
--- a/nssa/src/public_transaction/transaction.rs
+++ b/nssa/src/public_transaction/transaction.rs
@@ -94,7 +94,7 @@ impl PublicTransaction {
             .map(|address| AccountWithMetadata {
                 account: state.get_account_by_address(address),
                 is_authorized: signer_addresses.contains(address),
-                fingerprint: address.into()
+                fingerprint: address.into(),
             })
             .collect();