diff --git a/src/keys/public.rs b/src/keys/public.rs
index c9e33cb..4d16868 100644
--- a/src/keys/public.rs
+++ b/src/keys/public.rs
@@ -4,14 +4,10 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use dusk_schnorr::NotePublicKey;
-
-use crate::{permutation, StealthAddress};
+use crate::{permutation, SecretKey, StealthAddress};
 
 use dusk_jubjub::{JubJubAffine, JubJubExtended, JubJubScalar};
 
-use super::secret::SecretKey;
-
 #[cfg(feature = "rkyv-impl")]
 use rkyv::{Archive, Deserialize, Serialize};
 
@@ -58,7 +54,7 @@ impl PublicKey {
         let rA = G * rA;
 
         let pk_r = rA + self.B;
-        let pk_r = NotePublicKey::from(pk_r);
+        let pk_r = pk_r.into();
 
         StealthAddress { R, pk_r }
     }
diff --git a/src/keys/secret.rs b/src/keys/secret.rs
index e584773..5a979e6 100644
--- a/src/keys/secret.rs
+++ b/src/keys/secret.rs
@@ -4,9 +4,7 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use super::public::PublicKey;
-use super::stealth::StealthAddress;
-use crate::{permutation, ViewKey};
+use crate::{permutation, PublicKey, StealthAddress, ViewKey};
 use dusk_jubjub::JubJubScalar;
 use dusk_schnorr::NoteSecretKey;
 
diff --git a/src/permutation.rs b/src/permutation.rs
index c9177d2..1a3edd1 100644
--- a/src/permutation.rs
+++ b/src/permutation.rs
@@ -7,7 +7,8 @@
 use dusk_jubjub::{JubJubExtended, JubJubScalar};
 use dusk_poseidon::sponge::truncated;
 
-/// Hashes a JubJub's ExtendedPoint into a JubJub's Scalar
+/// Hashes a JubJub's ExtendedPoint into a JubJub's Scalar using the poseidon
+/// hash function
 pub fn hash(p: &JubJubExtended) -> JubJubScalar {
     truncated::hash(&p.to_hash_inputs())
 }
diff --git a/src/transaction/transfer.rs b/src/transaction/transfer.rs
index 1975f1c..39c8f33 100644
--- a/src/transaction/transfer.rs
+++ b/src/transaction/transfer.rs
@@ -6,17 +6,16 @@
 
 use alloc::vec::Vec;
 
-use crate::StealthAddress;
 use dusk_bls12_381::BlsScalar;
 use dusk_poseidon::cipher::PoseidonCipher;
 #[cfg(feature = "rkyv-impl")]
 use rkyv::{Archive, Deserialize, Serialize};
 
-use super::ModuleId;
-
 use crate::crossover::Crossover;
 use crate::message::Message;
 use crate::note::Note;
+use crate::transaction::ModuleId;
+use crate::StealthAddress;
 
 /// The depth of the transfer tree.
 pub const TRANSFER_TREE_DEPTH: usize = 17;